tree 56897b891842ff3f52536c51dfc82a579e718713
parent ae1a25da8448271a99745da03100d5299575a269
parent 432dc14fa40dea427d9ed476965001a816ff833b
author Russell King <rmk@dyn-67.arm.linux.org.uk> 1234043008 +0000
committer Russell King <rmk+kernel@arm.linux.org.uk> 1234043008 +0000

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

Conflicts:

	arch/arm/configs/magician_defconfig