From: John W. Linville <linville@tuxdriver.com>
Date: Wed, 5 Sep 2012 18:48:15 +0000 (-0400)
Subject: Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211
X-Git-Tag: v3.6-rc6~18^2~22^2~18
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=785a7de9ee5ab1ff2ec9c6e58667bde1055f2f1b;p=profile%2Fivi%2Fkernel-x86-ivi.git

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

785a7de9ee5ab1ff2ec9c6e58667bde1055f2f1b