From: John W. Linville <linville@tuxdriver.com>
Date: Wed, 30 Apr 2014 16:04:27 +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.16/fixes-against-rc1~36^2~279^2^2~12
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f6595444c1ee798f9c227107bb3ab14730c6497a;p=pandora-kernel.git

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

Conflicts:
	net/mac80211/chan.c
---

f6595444c1ee798f9c227107bb3ab14730c6497a
Reading git-diff-tree failed