Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac802...
authorJohn W. Linville <linville@tuxdriver.com>
Mon, 3 Jun 2013 19:55:37 +0000 (15:55 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Mon, 3 Jun 2013 19:55:37 +0000 (15:55 -0400)
commit133eb82f0904049be96a8128b513e19e538fde5d
treefb34518864993d199239ef35a1137102b6fa1a73
parent4da2a54a842db6921289e3e25b0739531a594dea
parented405be5cb5e8e494e8dcd83b6eb1add34dc752a
Merge branch 'for-john' of git://git./linux/kernel/git/jberg/mac80211-next
drivers/net/wireless/iwlwifi/mvm/mac80211.c