]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211
authorJohn W. Linville <linville@tuxdriver.com>
Mon, 6 Jan 2014 19:19:18 +0000 (14:19 -0500)
committerJohn W. Linville <linville@tuxdriver.com>
Mon, 6 Jan 2014 19:19:18 +0000 (14:19 -0500)

Trivial merge