From: John W. Linville <linville@tuxdriver.com>
Date: Thu, 15 Aug 2013 19:36:55 +0000 (-0400)
Subject: Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211
X-Git-Tag: v3.11-rc7~11^2~8^2^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=48c3e371350701444db51e8b35b5928d74dbacc3;p=thirdparty%2Fkernel%2Flinux.git

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

48c3e371350701444db51e8b35b5928d74dbacc3