Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211
authorJohn W. Linville <linville@tuxdriver.com>
Thu, 15 Aug 2013 19:36:55 +0000 (15:36 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Thu, 15 Aug 2013 19:36:55 +0000 (15:36 -0400)
commit48c3e371350701444db51e8b35b5928d74dbacc3
tree4782450e10f6fa9175ae3565cbda258ea26dace7
parent909bd5926d474e275599094acad986af79671ac9
parentdee8a9732e713480075adbbca8eb220c5b8d1216
Merge branch 'for-john' of git://git./linux/kernel/git/jberg/mac80211