From: John W. Linville <linville@tuxdriver.com>
Date: Fri, 28 Jan 2011 21:23:14 +0000 (-0500)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel... 
X-Git-Tag: v2.6.39-rc1~468^2~417^2~26
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3e11210d46a4f252f41db6e442b46026aeddbb59;p=pandora-kernel.git

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

Conflicts:
	drivers/net/wireless/ath/ath9k/init.c
---

3e11210d46a4f252f41db6e442b46026aeddbb59
Reading git-diff-tree failed