From: John W. Linville <linville@tuxdriver.com>
Date: Fri, 23 Apr 2010 18:43:45 +0000 (-0400)
Subject: Merge branch 'master' into for-davem
X-Git-Tag: v2.6.35-rc1~473^2~393
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3b51cc996e81d8a113416d8094fa4a88f8360a51;p=pandora-kernel.git

Merge branch 'master' into for-davem

Conflicts:
	drivers/net/wireless/ath/ath9k/phy.c
	drivers/net/wireless/iwlwifi/iwl-6000.c
	drivers/net/wireless/iwlwifi/iwl-debugfs.c
---

3b51cc996e81d8a113416d8094fa4a88f8360a51
Reading git-diff-tree failed