From: John W. Linville <linville@tuxdriver.com>
Date: Mon, 19 Nov 2012 19:37:43 +0000 (-0500)
Subject: Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211
X-Git-Tag: v3.7-rc8~6^2~2^2~4
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e56108d92760c89ce21c30aa02588595b9396251;p=platform%2Fupstream%2Fkernel-adaptation-pc.git

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

e56108d92760c89ce21c30aa02588595b9396251