From: John W. Linville <linville@tuxdriver.com>
Date: Fri, 24 Sep 2010 19:52:34 +0000 (-0400)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel... 
X-Git-Tag: v2.6.37-rc1~147^2~265^2^2~39
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=29ad2facd47f8e37eab8b156e2c384fa181c8b4a;p=pandora-kernel.git

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

Conflicts:
	drivers/net/wireless/ath/ath5k/base.c
	net/mac80211/main.c
---

29ad2facd47f8e37eab8b156e2c384fa181c8b4a
Reading git-diff-tree failed