From: David S. Miller <davem@davemloft.net>
Date: Tue, 16 Sep 2008 21:11:43 +0000 (-0700)
Subject: Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
X-Git-Tag: v2.6.28-rc1~706^2~19
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2e57572a50a4de41c6cbc879a4866a312d4cd316;p=pandora-kernel.git

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

Conflicts:

	arch/sparc64/kernel/pci_psycho.c
---

2e57572a50a4de41c6cbc879a4866a312d4cd316
Reading git-diff-tree failed