From: John W. Linville <linville@tuxdriver.com>
Date: Mon, 22 Jul 2013 20:00:49 +0000 (-0400)
Subject: Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211
X-Git-Tag: MMI-PSA29.97-13-9~13794^2~25^2^2~32
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=22f64bd30366417f6f0648fcf45f8aa409e2ba25;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

Merge branch 'for-john' of git://git./linux/kernel/git/jberg/mac80211
---

22f64bd30366417f6f0648fcf45f8aa409e2ba25