Merge branches 'pxa-ezx', 'pxa-magician' and 'pxa-palm' into pxa
commit67f5cd0f6ad86f8faacd0c00ffd0d38f228bad8e
authorRussell King <rmk@dyn-67.arm.linux.org.uk>
Thu, 10 Jul 2008 18:50:38 +0000 (10 19:50 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Thu, 10 Jul 2008 18:50:38 +0000 (10 19:50 +0100)
tree47d9b7bbeb6b28f85fe107928a6f59cdda891fa0
parent79c410db6680e8393314003739233b1df0a338fe
parent14d1012db8462bbb7139ac4622f92e541d3019d1
parentd4b19c42ca558273ab99a1093621f267d9d073fc
Merge branches 'pxa-ezx', 'pxa-magician' and 'pxa-palm' into pxa
MAINTAINERS
arch/arm/mach-pxa/Kconfig
arch/arm/mach-pxa/Makefile
drivers/video/pxafb.c
include/asm-arm/arch-pxa/regs-lcd.h