Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211
authorJohn W. Linville <linville@tuxdriver.com>
Mon, 29 Jul 2013 18:46:51 +0000 (14:46 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Mon, 29 Jul 2013 18:46:51 +0000 (14:46 -0400)
commit161915a07d501404710f5c89f9c98e6b58c085f0
tree545200bb39b3398f4b8be19ee7bef6f2382005f1
parent718803d161936cf347a21a5a1df29c11fbd4978d
parent23df0b731954502a9391e739b92927cee4360343
Merge branch 'for-john' of git://git./linux/kernel/git/jberg/mac80211