Merge branch 'devel' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa...
commite4cc8fca1c77905bce91b42a1372d4a73069a529
authorRussell King <rmk@dyn-67.arm.linux.org.uk>
Sat, 7 Feb 2009 21:43:28 +0000 (7 21:43 +0000)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Sat, 7 Feb 2009 21:43:28 +0000 (7 21:43 +0000)
tree56897b891842ff3f52536c51dfc82a579e718713
parentae1a25da8448271a99745da03100d5299575a269
parent432dc14fa40dea427d9ed476965001a816ff833b
Merge branch 'devel' of git://git./linux/kernel/git/ycmiao/pxa-linux-2.6 into devel

Conflicts:

arch/arm/configs/magician_defconfig
MAINTAINERS
arch/arm/configs/em_x270_defconfig
arch/arm/configs/magician_defconfig