]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commitb28e333f2d1e3d30decd3500c4e4fd62fd2bdda7
treec0b8a8185e7473cd96a730c90509f13c96e100af
parent47b6cab0c38ee8bf89b84907c21a7860a7ab29bf
parent2f3e6ce8c5550d85dc13e5ad6179158df0857e06
parent46f4eab3714ef7e18788633e84695480103025b2
Merge branches 'pxa-ian' and 'pxa-xm270' into pxa

Conflicts:

MAINTAINERS
MAINTAINERS