From: John W. Linville <linville@tuxdriver.com>
Date: Tue, 21 Aug 2012 20:00:21 +0000 (-0400)
Subject: Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac802... 
X-Git-Tag: omap-for-v3.7-rc1/fixes-cpufreq-signed~47^2~278^2^2~6
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=01e17dacd47101ad7d33152bbfbbd4394352d2e6;p=pandora-kernel.git

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

Conflicts:
	drivers/net/wireless/mac80211_hwsim.c
---

01e17dacd47101ad7d33152bbfbbd4394352d2e6
Reading git-diff-tree failed