From: John W. Linville <linville@tuxdriver.com>
Date: Mon, 6 Jan 2014 19:19:18 +0000 (-0500)
Subject: Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211
X-Git-Tag: next-20140107~114^2~1
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=a50f9d5ee0f81271be49d64801bee0dfe84c2127;p=karo-tx-linux.git

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

a50f9d5ee0f81271be49d64801bee0dfe84c2127