From: John W. Linville <linville@tuxdriver.com>
Date: Thu, 22 Aug 2013 15:35:22 +0000 (-0400)
Subject: Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211
X-Git-Tag: v3.11.1~21^2~25^2^2~3
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=89b5f74a268d6a7037c8ea9d9b7d4ce35097c6fd;p=platform%2Fupstream%2Fkernel-adaptation-pc.git

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

89b5f74a268d6a7037c8ea9d9b7d4ce35097c6fd