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)
commit5419575e838cd2cd11a1b30449eb58decdf51f9f
tree36b20c033f58751fe11b71938738ad2cb39b20d0
parent0c49b69931a0001912bb4e48c415d33031ddb217
parent64629b9d412544b0ed744405944fd6edf79d7e0d
Merge branch 'for-john' of git://git./linux/kernel/git/jberg/mac80211-next
drivers/net/wireless/mwifiex/cfg80211.c
drivers/net/wireless/mwifiex/main.h