Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211
authorJohn W. Linville <linville@tuxdriver.com>
Wed, 13 Jun 2012 18:05:40 +0000 (14:05 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Wed, 13 Jun 2012 18:05:40 +0000 (14:05 -0400)
commit1f7e0102820f11a0dcd3a2f90140abf14c894ba8
tree2ae08acbb26ddb2fa662db63c1dd111c0b5b646f
parent6ddcd46463aa66855f1f8e74de454740a5f4aef4
parent79543d8eecc0957ac6fe3ec1e2486ad31d4b67a3
Merge branch 'for-john' of git://git./linux/kernel/git/jberg/mac80211