From: John W. Linville <linville@tuxdriver.com>
Date: Mon, 29 Oct 2012 18:14:48 +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~15481^2~2^2~16
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=efec22b4689bbfdbed26367219e981fcc946b9a6;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

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

efec22b4689bbfdbed26367219e981fcc946b9a6