]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac802...
authorJohn W. Linville <linville@tuxdriver.com>
Tue, 25 Sep 2012 19:54:32 +0000 (15:54 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Tue, 25 Sep 2012 19:54:32 +0000 (15:54 -0400)
commit847f6489bcd90e5aa70d86c95793020e639c519c
tree36b20c033f58751fe11b71938738ad2cb39b20d0
parent17395488a332b3d97bf6c97103f7f6533a692d5e
parentfb020251914bb6a1b3c4c14ab9bb7003b230f202
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next
drivers/net/wireless/mwifiex/cfg80211.c
drivers/net/wireless/mwifiex/main.h