Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211
authorJohn W. Linville <linville@tuxdriver.com>
Thu, 23 Aug 2012 13:51:15 +0000 (09:51 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Thu, 23 Aug 2012 13:51:15 +0000 (09:51 -0400)
commitc6b6eedc29dec8f779fd3420e8c62fd18e7b7c97
tree5ff8ed3094d59b5b8ae17ab864e862a4ec5ec37d
parentea2d218308e5710c70d76eb3c2876988c88119cc
parent27f011243a6e4e8b81078df1d83608dae31e3d38
Merge branch 'for-john' of git://git./linux/kernel/git/jberg/mac80211