Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211
authorJohn W. Linville <linville@tuxdriver.com>
Mon, 19 Nov 2012 19:37:43 +0000 (14:37 -0500)
committerJohn W. Linville <linville@tuxdriver.com>
Mon, 19 Nov 2012 19:37:43 +0000 (14:37 -0500)
commite56108d92760c89ce21c30aa02588595b9396251
tree74fdba5362746e534b25063192cf645d7d279fbb
parentda8fb123b041e487d28f54d3a77a15139cb9e3b9
parent38c1a01cf10c6e4049b4ffbd4a6af655df2a46e1
Merge branch 'for-john' of git://git./linux/kernel/git/jberg/mac80211