From: Russell King <rmk@dyn-67.arm.linux.org.uk>
Date: Tue, 23 Dec 2008 18:06:37 +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~3
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=40321fd21c1eb1fb1886eea73b5f87c5e41ff2fb;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/am200epd.c
	arch/arm/mach-pxa/ezx.c
---

40321fd21c1eb1fb1886eea73b5f87c5e41ff2fb
Reading git-diff-tree failed