]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commitdc5207157cafb2b13854059a11636d327916ae1e
tree0092a805f7a152ed161ee8995bb1672a7b74cced
parent2bbe69e6422e56625c8ac1b78dfd3fa3bb25ee8f
parentae1fe08d8f8f13296f14d910e74fb325be5a4b1e
Merge branch 'master' of git://git.kernel.org/pub/scm/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