Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
authorJohn W. Linville <linville@tuxdriver.com>
Fri, 28 Sep 2012 15:11:16 +0000 (11:11 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Fri, 28 Sep 2012 15:11:16 +0000 (11:11 -0400)
commitc487606f835a93a725bac1aefd536be98f22474d
treec77571a519905945e24a9ea6e4e44d9032fd527d
parentd9f72f359e00a45a6cd7cc2d5121b04b9dc927e1
parent97ea6d0f3eb019891038cd2dfddb749d6bf219be
Merge branch 'master' of git://git./linux/kernel/git/linville/wireless-next into for-davem

Conflicts:
net/nfc/netlink.c

Signed-off-by: John W. Linville <linville@tuxdriver.com>
Documentation/feature-removal-schedule.txt
MAINTAINERS
drivers/net/wireless/mac80211_hwsim.c
include/net/cfg80211.h
include/net/nfc/nfc.h
net/nfc/netlink.c
net/wireless/mlme.c
net/wireless/nl80211.c