From: David Woodhouse <David.Woodhouse@intel.com>
Date: Mon, 5 Jan 2009 09:50:33 +0000 (+0100)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
X-Git-Tag: v2.6.29-rc1~33^2~17
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=353816f43d1fb340ff2d9a911dd5d0799c09f6a5;p=pandora-kernel.git

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

Conflicts:
	arch/arm/mach-pxa/corgi.c
	arch/arm/mach-pxa/poodle.c
	arch/arm/mach-pxa/spitz.c
---

353816f43d1fb340ff2d9a911dd5d0799c09f6a5
Reading git-diff-tree failed