From: John W. Linville <linville@tuxdriver.com>
Date: Wed, 8 Dec 2010 21:23:31 +0000 (-0500)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel... 
X-Git-Tag: v2.6.38-rc1~476^2~169^2^2~2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=393934c6b5c8d00f9d1ae20670d4a770f07a418a;p=pandora-kernel.git

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

Conflicts:
	drivers/net/wireless/ath/ath9k/ath9k.h
	drivers/net/wireless/ath/ath9k/main.c
	drivers/net/wireless/ath/ath9k/xmit.c
---

393934c6b5c8d00f9d1ae20670d4a770f07a418a
Reading git-diff-tree failed