From: John W. Linville <linville@tuxdriver.com>
Date: Thu, 23 Aug 2012 13:51: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~20
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c6b6eedc29dec8f779fd3420e8c62fd18e7b7c97;p=platform%2Fkernel%2Flinux-3.10.git

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

c6b6eedc29dec8f779fd3420e8c62fd18e7b7c97