Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
authorJohn W. Linville <linville@tuxdriver.com>
Wed, 18 Apr 2012 18:17:13 +0000 (14:17 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Wed, 18 Apr 2012 18:27:48 +0000 (14:27 -0400)
commit59ef43e681d103a51c3727dad0315e093f07ec61
tree87f6320f1440ce3ce6c0c15ad3cef8bc98186f88
parent91fbe33034c184c6a60e31c2207a2f7ec2f180dc
parentb5abcf0219263f4e961dca71cbe26e06c5b0ee68
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
MAINTAINERS
drivers/net/wireless/ipw2x00/ipw2100.c
drivers/net/wireless/ipw2x00/ipw2200.c
drivers/net/wireless/iwlwifi/iwl-testmode.c
drivers/net/wireless/mac80211_hwsim.c
drivers/net/wireless/ti/wlcore/testmode.c
include/net/nfc/nfc.h
net/nfc/core.c
net/nfc/netlink.c
net/nfc/nfc.h
net/wireless/nl80211.c