Merge branches 'pxa-ian' and 'pxa-xm270' into pxa
authorRussell King <rmk@dyn-67.arm.linux.org.uk>
Sat, 12 Jul 2008 20:42:04 +0000 (21:42 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Sat, 12 Jul 2008 20:42:04 +0000 (21:42 +0100)
commita9da4f7ed6a702996ac9d1bbaf1a3969a4c092b3
treec0b8a8185e7473cd96a730c90509f13c96e100af
parent67f5cd0f6ad86f8faacd0c00ffd0d38f228bad8e
parent13f7558237ed841b19f11e0920c01c4d6d50fcc5
parent03fe6692135842d992fe3e599e62bbe72ce08fef
Merge branches 'pxa-ian' and 'pxa-xm270' into pxa

Conflicts:

MAINTAINERS
MAINTAINERS