From: David S. Miller <davem@davemloft.net>
Date: Fri, 31 Jul 2009 02:22:43 +0000 (-0700)
Subject: Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
X-Git-Tag: v2.6.32-rc1~703^2~507
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=df597efb5737063497f1a4f7c996cc9aec294230;p=pandora-kernel.git

Merge branch 'master' of /linux/kernel/git/davem/net-2.6

Conflicts:
	drivers/net/wireless/iwlwifi/iwl-3945.h
	drivers/net/wireless/iwlwifi/iwl-tx.c
	drivers/net/wireless/iwlwifi/iwl3945-base.c
---

df597efb5737063497f1a4f7c996cc9aec294230
Reading git-diff-tree failed