From: David S. Miller <davem@davemloft.net>
Date: Mon, 8 Sep 2008 22:39:30 +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~53
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=98d86c091534f35c4bab294451ae6bccab8e9075;p=pandora-kernel.git

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

Conflicts:

	arch/sparc/kernel/of_device.c
---

98d86c091534f35c4bab294451ae6bccab8e9075
Reading git-diff-tree failed