From: John W. Linville <linville@tuxdriver.com>
Date: Mon, 28 Jan 2013 19:46:50 +0000 (-0500)
Subject: Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=cb73e2b9ed1240398c773eec3c976edd99baf5b9;p=sagit-ice-cold%2Fkernel_xiaomi_msm8998.git

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

cb73e2b9ed1240398c773eec3c976edd99baf5b9