From: John W. Linville <linville@tuxdriver.com>
Date: Fri, 18 Oct 2013 17:35:39 +0000 (-0400)
Subject: Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211
X-Git-Tag: v3.13-rc1~7^2~6^2^2~12^2~10
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=334300f247abc4f21124ff3ac192df5222ea79bf;p=uclinux-h8%2Flinux.git

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

334300f247abc4f21124ff3ac192df5222ea79bf