From: John W. Linville <linville@tuxdriver.com>
Date: Fri, 29 Mar 2013 20:41: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.10/dt-fixes-for-merge-window~65^2~170^2^2~71
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9a574cd67a447059f9c14bbef47873315d7f7b35;p=pandora-kernel.git

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

Conflicts:
	net/mac80211/sta_info.c
	net/wireless/core.h
---

9a574cd67a447059f9c14bbef47873315d7f7b35
Reading git-diff-tree failed