From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Fri, 6 Aug 2010 17:10:25 +0000 (+0100)
Subject: Merge branch 'devel' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa... 
X-Git-Tag: v2.6.36-rc1~102^2^2^2~2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f165eb77f49cb6f6e86e2f2f09183904b2965d19;p=pandora-kernel.git

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

Conflicts:
	arch/arm/mach-pxa/palmt5.c
	arch/arm/mach-pxa/palmtreo.c
---

f165eb77f49cb6f6e86e2f2f09183904b2965d19
Reading git-diff-tree failed