From: John W. Linville <linville@tuxdriver.com>
Date: Wed, 18 Apr 2012 18:17:13 +0000 (-0400)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel... 
X-Git-Tag: v3.5-rc1~109^2~410
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=59ef43e681d103a51c3727dad0315e093f07ec61;p=pandora-kernel.git

Merge branch 'master' of git://git./linux/kernel/git/linville/wireless-next into for-davem

Conflicts:
	drivers/net/wireless/iwlwifi/iwl-testmode.c
	include/net/nfc/nfc.h
	net/nfc/netlink.c
	net/wireless/nl80211.c
---

59ef43e681d103a51c3727dad0315e093f07ec61
Reading git-diff-tree failed