From: David S. Miller <davem@davemloft.net>
Date: Mon, 29 Dec 2008 04:19:47 +0000 (-0800)
Subject: Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
X-Git-Tag: v2.6.29-rc1~568^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e3c6d4ee545e427b55882d97d3b663c6411645fe;p=pandora-kernel.git

Merge branch 'master' of /linux/kernel/git/torvalds/linux-2.6

Conflicts:
	arch/sparc64/kernel/idprom.c
---

e3c6d4ee545e427b55882d97d3b663c6411645fe
Reading git-diff-tree failed