Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211
authorJohn W. Linville <linville@tuxdriver.com>
Mon, 22 Jul 2013 20:00:49 +0000 (16:00 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Mon, 22 Jul 2013 20:00:49 +0000 (16:00 -0400)
commit22f64bd30366417f6f0648fcf45f8aa409e2ba25
tree95b98868ec234f8323da6aaea9f7603d0d7c280b
parent64b6f46f1141ad938e354f37af62e28da972e8eb
parent5c9fc93bc9bc417418fc1b6366833ae6a07b804d
Merge branch 'for-john' of git://git./linux/kernel/git/jberg/mac80211