tree bd5b0b4efb552bacd812f9e6e08a29bae70c0da1
parent d281bc9d8a22419abc254f86a7fc268bb99914e1
parent bc2fd1c09c226ea47ab8301cde6dbcf9e5c78b73
author Russell King <rmk@dyn-67.arm.linux.org.uk> 1228255660 +0000
committer Russell King <rmk+kernel@arm.linux.org.uk> 1228255660 +0000

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

Conflicts:

	arch/arm/mach-pxa/pxa25x.c