]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commitbd75af4d0efd9b3948e815f0838c631f7364a51d
treec77571a519905945e24a9ea6e4e44d9032fd527d
parent0be7383c8c89321e15fa4fce369f072a275473eb
parente3587ee2bde18681217088a35ebf07eb3ee1354d
Merge branch 'master' of git://git.kernel.org/pub/scm/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