Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac802...
authorJohn W. Linville <linville@tuxdriver.com>
Mon, 24 Feb 2014 20:03:32 +0000 (15:03 -0500)
committerJohn W. Linville <linville@tuxdriver.com>
Mon, 24 Feb 2014 20:03:32 +0000 (15:03 -0500)
commitc77986c78aa941af8266272841567e78b72d54cc
treecb30e1bd7d5799bfce5a3837bcfddee059a81733
parent9e4b4269ecee426f1647425a24186dd1566db554
parent6658ab80fd4ef940fc2366ddb66690a15ea69c18
Merge branch 'for-john' of git://git./linux/kernel/git/jberg/mac80211-next