Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211
authorJohn W. Linville <linville@tuxdriver.com>
Thu, 10 Oct 2013 17:19:58 +0000 (13:19 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Thu, 10 Oct 2013 17:19:58 +0000 (13:19 -0400)
commitc380a1fda55c7853c5e767998365247f4030ef3b
treedc65f2557d4271ff56b1e6fd84bba4f9cf4a1ad3
parentd107babca27f3c08e399616483e4c5f010bd24d3
parent22c4ceed0184318ec5a6182c6d75d398452c2e39
Merge branch 'for-john' of git://git./linux/kernel/git/jberg/mac80211