Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211
authorJohn W. Linville <linville@tuxdriver.com>
Thu, 6 Mar 2014 18:47:16 +0000 (13:47 -0500)
committerJohn W. Linville <linville@tuxdriver.com>
Thu, 6 Mar 2014 18:47:16 +0000 (13:47 -0500)
commit73c8daa083973a4e16e39c3a52abb64bd3592de8
tree6054e61ede5badf364b0724ff18b394b06f915c7
parent9b8ba9f518829f7b7776e3b1f8c9f83c9696cf28
parent864a6040f395464003af8dd0d8ca86fed19866d4
Merge branch 'for-john' of git://git./linux/kernel/git/jberg/mac80211