From: John W. Linville <linville@tuxdriver.com>
Date: Thu, 20 Feb 2014 20:37:15 +0000 (-0500)
Subject: Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211
X-Git-Tag: next-20140306~118^2~19
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=d421c62e37c9c83496fa721d4f4cd4a6cae82151;p=karo-tx-linux.git

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

d421c62e37c9c83496fa721d4f4cd4a6cae82151