From: Russell King <rmk@dyn-67.arm.linux.org.uk>
Date: Sat, 7 Feb 2009 21:43:28 +0000 (+0000)
Subject: Merge branch 'devel' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa... 
X-Git-Tag: v2.6.30-rc1~636^2~52^2~34
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e4cc8fca1c77905bce91b42a1372d4a73069a529;p=pandora-kernel.git

Merge branch 'devel' of git://git./linux/kernel/git/ycmiao/pxa-linux-2.6 into devel

Conflicts:

	arch/arm/configs/magician_defconfig
---

e4cc8fca1c77905bce91b42a1372d4a73069a529
Reading git-diff-tree failed