From: Russell King <rmk@dyn-67.arm.linux.org.uk>
Date: Tue, 2 Dec 2008 22:07:40 +0000 (+0000)
Subject: Merge branch 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa... 
X-Git-Tag: v2.6.29-rc1~559^2~35
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c5b84b3bb0c055d70dc9f1b5e900378bc9d059ea;p=pandora-kernel.git

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

Conflicts:

	arch/arm/mach-pxa/pxa25x.c
---

c5b84b3bb0c055d70dc9f1b5e900378bc9d059ea
Reading git-diff-tree failed