From: John W. Linville <linville@tuxdriver.com>
Date: Mon, 25 Mar 2013 20:38:02 +0000 (-0400)
Subject: Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac802... 
X-Git-Tag: v3.10-rc1~120^2~170^2^2~118
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c78b3841fac9a59c7494be143aa7f2e69ea47958;p=thirdparty%2Fkernel%2Flinux.git

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

c78b3841fac9a59c7494be143aa7f2e69ea47958