summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRussell King <rmk@dyn-67.arm.linux.org.uk>2008-07-12 22:42:04 +0200
committerRussell King <rmk+kernel@arm.linux.org.uk>2008-07-12 22:42:04 +0200
commita9da4f7ed6a702996ac9d1bbaf1a3969a4c092b3 (patch)
treec0b8a8185e7473cd96a730c90509f13c96e100af
parentMerge branches 'pxa-ezx', 'pxa-magician' and 'pxa-palm' into pxa (diff)
parentClocklib: Fix SA1111 clock name mess. (diff)
parent[ARM] 5107/1: Add maintainer entries for the CompuLab CM-X270/EM-X270 machines (diff)
downloadlinux-a9da4f7ed6a702996ac9d1bbaf1a3969a4c092b3.tar.xz
linux-a9da4f7ed6a702996ac9d1bbaf1a3969a4c092b3.zip
Merge branches 'pxa-ian' and 'pxa-xm270' into pxa
Conflicts: MAINTAINERS