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: v3.13-rc8~4^2~4^2^2~2
X-Git-Url: http://pileus.org/git/?a=commitdiff_plain;h=a50f9d5ee0f81271be49d64801bee0dfe84c2127;p=~andy%2Flinux

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

a50f9d5ee0f81271be49d64801bee0dfe84c2127