From: John W. Linville <linville@tuxdriver.com>
Date: Tue, 23 Apr 2013 18:09:39 +0000 (-0400)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
X-Git-Tag: omap-for-v3.10/dt-fixes-for-merge-window~65^2~43^2^2~16
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ec094144cdd54a36e65a69161e9705959c09cb23;p=pandora-kernel.git

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

Conflicts:
	drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c
---

ec094144cdd54a36e65a69161e9705959c09cb23
Reading git-diff-tree failed