]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit4c217f6086e4138dcba19362f97e1da45ac3e56a
treea6063f77bd719d933823915d2273eaadb6331611
parenta28154251594b85d439793304011d90e3c6047b8
parent3afc4f251c3baf2691263d21149b2a8bb34cc379
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