From: John W. Linville <linville@tuxdriver.com>
Date: Mon, 24 Sep 2012 18:34:40 +0000 (-0400)
Subject: Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac802... 
X-Git-Tag: v3.7-rc1~145^2~31^2^2~67
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9b4e9e756541fd5d1223b323ed5a8a8545dd11cd;p=thirdparty%2Fkernel%2Fstable.git

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

9b4e9e756541fd5d1223b323ed5a8a8545dd11cd