Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac802...
authorJohn W. Linville <linville@tuxdriver.com>
Fri, 9 Aug 2013 19:08:10 +0000 (15:08 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Fri, 9 Aug 2013 19:08:10 +0000 (15:08 -0400)
commitfa5978447cb0144411df3a588e3d01459c12d855
tree998e58c515def864c8cd87511625d1e7184a7a21
parent2437f3c5d6bc07252c6d7d24448755e0c35ed91c
parent73da7d5bab79ad7e16ff44d67c3fe8b9c0b33e5b
Merge branch 'for-john' of git://git./linux/kernel/git/jberg/mac80211-next
net/mac80211/cfg.c
net/wireless/nl80211.c