Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
authorJohn W. Linville <linville@tuxdriver.com>
Tue, 17 Jul 2012 19:31:33 +0000 (15:31 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Tue, 17 Jul 2012 19:31:33 +0000 (15:31 -0400)
commitd369f7b2b257ad6369b72d39e2f989833754a9ce
tree0092a805f7a152ed161ee8995bb1672a7b74cced
parent23cb3b2121323443834296a8ecb582b8aeb78d75
parent8a70e7f8f3081770238fbe19f78116af1d4b0652
Merge branch 'master' of git://git./linux/kernel/git/linville/wireless
drivers/net/wireless/mwifiex/cfg80211.c
net/mac80211/tx.c
net/nfc/hci/core.c
net/nfc/nci/core.c