]> 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)
commit25092cf8c419860c79acaafe4bb7735a82149969
treec77571a519905945e24a9ea6e4e44d9032fd527d
parent37a664b839ba96b09a50c949eed7115094b511ac
parent86f624d3f4ed974beda15cf8fd9d95b489a5e658
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