Merge branch 'pxa' into devel
authorRussell King <rmk@dyn-67.arm.linux.org.uk>
Sun, 13 Jul 2008 11:05:49 +0000 (12:05 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Sun, 13 Jul 2008 11:05:49 +0000 (12:05 +0100)
commit044e5f45e4ad890d03bd1e8bb44c634397cac24d
treea6063f77bd719d933823915d2273eaadb6331611
parentf0006314d37639714da9658cf4ff3f1f9f420764
parentfaf64ed4968e354624f330c6da6c1ce8b05a0713
Merge branch 'pxa' into devel

Conflicts:

arch/arm/configs/em_x270_defconfig
arch/arm/configs/xm_x270_defconfig
MAINTAINERS
arch/arm/Kconfig
arch/arm/configs/xm_x270_defconfig
arch/arm/mm/Makefile
drivers/usb/gadget/Kconfig
drivers/video/pxafb.c