Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211
authorJohn W. Linville <linville@tuxdriver.com>
Fri, 28 Feb 2014 18:42:54 +0000 (13:42 -0500)
committerJohn W. Linville <linville@tuxdriver.com>
Fri, 28 Feb 2014 18:42:54 +0000 (13:42 -0500)
commitb95eddbb907538d5501d4d659056e987de64d978
tree85e9385bc476992ce21bf3b4a34bcd627cc2e534
parent5e038890b60c34267c99528f3cb0fc4d6c75d89d
parentcb664981607a6b5b3d670ad57bbda893b2528d96
Merge branch 'for-john' of git://git./linux/kernel/git/jberg/mac80211