Merge git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211
authorJohn W. Linville <linville@tuxdriver.com>
Fri, 18 Jul 2014 16:55:45 +0000 (12:55 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Fri, 18 Jul 2014 16:55:45 +0000 (12:55 -0400)
commit7fc942722209208241b7e676e80b5e8a3efd2960
tree0dbee495f95f0ea0c9b84c70fe7fa0cf6cd01941
parent2c4db12ec469b9fcdad9f6bfd6fa20e65a563ac5
parent8c26d458394be44e135d1c6bd4557e1c4e1a0535
Merge git://git./linux/kernel/git/jberg/mac80211