From: David S. Miller <davem@davemloft.net>
Date: Sat, 28 Jun 2008 08:19:40 +0000 (-0700)
Subject: Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
X-Git-Tag: v2.6.27-rc1~969^2~256
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1b63ba8a86c85524a8d7e5953b314ce71ebcb9c9;p=pandora-kernel.git

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

Conflicts:

	drivers/net/wireless/iwlwifi/iwl4965-base.c
---

1b63ba8a86c85524a8d7e5953b314ce71ebcb9c9
Reading git-diff-tree failed