From: John W. Linville <linville@tuxdriver.com>
Date: Tue, 23 Oct 2012 15:41:46 +0000 (-0400)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
X-Git-Tag: omap-for-v3.8/fixes-for-merge-window-v4-signed~45^2~337^2^2~69
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9b34f40c20111ba658f88e1669598db494be1fbc;p=pandora-kernel.git

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

Conflicts:
	drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c
	net/mac80211/mlme.c
---

9b34f40c20111ba658f88e1669598db494be1fbc
Reading git-diff-tree failed