From: John W. Linville <linville@tuxdriver.com>
Date: Tue, 22 Nov 2011 19:05:46 +0000 (-0500)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux
X-Git-Tag: v3.3-rc1~182^2~261^2~148
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=515db09338704a6ad7d27b5f1e33820d3052edd2;p=pandora-kernel.git

Merge branch 'master' of git://git./linux/kernel/git/torvalds/linux

Conflicts:
	drivers/net/wireless/iwlegacy/iwl-debugfs.c
	drivers/net/wireless/iwlegacy/iwl-rx.c
	drivers/net/wireless/iwlegacy/iwl-scan.c
	drivers/net/wireless/iwlegacy/iwl-tx.c
	include/net/bluetooth/bluetooth.h
---

515db09338704a6ad7d27b5f1e33820d3052edd2
Reading git-diff-tree failed