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)
1  2 
drivers/net/wireless/mwifiex/cfg80211.c
drivers/net/wireless/mwifiex/main.h

Simple merge