tree db166579758930f52a1a625eb872bd96bd7ff88e
parent fc1caf6eafb30ea185720e29f7f5eccca61ecd60
parent a6cd7eb374647b572ae9e7dbfe49871e6996e8e0
author Russell King <rmk+kernel@arm.linux.org.uk> 1281114625 +0100
committer Russell King <rmk+kernel@arm.linux.org.uk> 1281114625 +0100

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

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