From: John W. Linville <linville@tuxdriver.com>
Date: Wed, 30 Jan 2013 19:22:19 +0000 (-0500)
Subject: Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac802... 
X-Git-Tag: v3.9-rc1~139^2~2^2^2~42^2~48
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=20fb9e50338199d9e88512703af4c560ab53bad4;p=thirdparty%2Fkernel%2Fstable.git

Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next
---

20fb9e50338199d9e88512703af4c560ab53bad4