From: John W. Linville <linville@tuxdriver.com>
Date: Wed, 10 Apr 2013 13:31: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~170^2^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6fe5468f452c0c40348ebd4e737758a842286ca8;p=pandora-kernel.git

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

Conflicts:
	drivers/net/wireless/rt2x00/rt2x00pci.c
---

6fe5468f452c0c40348ebd4e737758a842286ca8
Reading git-diff-tree failed