Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211
authorJohn W. Linville <linville@tuxdriver.com>
Wed, 23 Jul 2014 17:01:14 +0000 (13:01 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Wed, 23 Jul 2014 17:01:14 +0000 (13:01 -0400)
commit3b8de0749276abcb86bd7a6ca6691769a4ba7987
treed8fb187da3f8caca8c4557b76b5b4fe6f85348b5
parent0eeb315b20774296f977cecf0010794cd690c594
parentfa8f136fe9a8fbdcb11a1db94f30146cae6d8777
Merge branch 'for-john' of git://git./linux/kernel/git/jberg/mac80211