Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211
authorJohn W. Linville <linville@tuxdriver.com>
Fri, 2 Aug 2013 18:54:19 +0000 (14:54 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Fri, 2 Aug 2013 18:54:19 +0000 (14:54 -0400)
commit89b59bcd3ad54c5cd5540ae12275f738dad333fb
tree67bc4454694a1df9d30fa6cd7474af1ae3c79ed1
parent788f7a56fce1bcb2067b62b851a086fca48a0056
parentddfe49b42d8ad4bfdf92d63d4a74f162660d878d
Merge branch 'for-john' of git://git./linux/kernel/git/jberg/mac80211