Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac802...
authorJohn W. Linville <linville@tuxdriver.com>
Thu, 19 Jul 2012 16:35:00 +0000 (12:35 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Thu, 19 Jul 2012 16:35:00 +0000 (12:35 -0400)
commit3e497e0215ae1d552a69bd88ea0d1a004f71cccd
tree9684b54d4d55aaddc98ddc46d069d9a423d92034
parent0cd06647b7c24f6633e32a505930a9aa70138c22
parent99102bd380f27b8dd5e058e69e3203bfad0cad94
Merge branch 'for-john' of git://git./linux/kernel/git/jberg/mac80211-next