Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211
authorJohn W. Linville <linville@tuxdriver.com>
Thu, 2 Aug 2012 17:49:38 +0000 (13:49 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Thu, 2 Aug 2012 17:49:38 +0000 (13:49 -0400)
commit1a26904eb63150bba2120fc2864e9307d1500691
treeb071dc0b08138a1f3d54972cc864b556c6995694
parente33cdac014d50dd9753e1399ae8b0b5cd98d7aa0
parent899852af60c212bfe9a2fb71d4d9082d2622df5c
Merge branch 'for-john' of git://git./linux/kernel/git/jberg/mac80211