From: John W. Linville <linville@tuxdriver.com>
Date: Fri, 25 Jul 2014 14:22:36 +0000 (-0400)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
X-Git-Tag: omap-for-v3.17/fixes-against-rc2~149^2~73^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9a244409d0b0cf3b1e46f1dc331f2c718597fae0;p=pandora-kernel.git

Merge branch 'master' of git://git./linux/kernel/git/linville/wireless

Conflicts:
	net/mac80211/cfg.c

Signed-off-by: John W. Linville <linville@tuxdriver.com>
---

9a244409d0b0cf3b1e46f1dc331f2c718597fae0
Reading git-diff-tree failed