Merge branches 'metronomefb', 'pxa-cm2xx', 'pxa-gumstix', 'pxa-misc', 'pxa-mitac...
Russell King [Tue, 7 Oct 2008 18:06:22 +0000 (19:06 +0100)]
Conflicts:

arch/arm/mach-pxa/poodle.c

1  2  3  4  5  6  7  8 
MAINTAINERS
arch/arm/mach-pxa/Kconfig
arch/arm/mach-pxa/Makefile

diff --cc MAINTAINERS
Simple merge
Simple merge
Simple merge