Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac802...
authorJohn W. Linville <linville@tuxdriver.com>
Fri, 19 Oct 2012 19:36:53 +0000 (15:36 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Fri, 19 Oct 2012 19:36:53 +0000 (15:36 -0400)
commit3cd17638fdf13d2f7fe76465cf74106e612af5eb
treea19bff1c69430750894129c99404130f4fec689d
parentbc27d5f14363a1065bf9437a5bca5409492b6c06
parentd012a605108a482392be80710ea35f1db27c4aa9
Merge branch 'for-john' of git://git./linux/kernel/git/jberg/mac80211-next