Merge branch 'sa1100' into devel
authorRussell King <rmk+kernel@arm.linux.org.uk>
Sun, 6 Dec 2009 17:00:33 +0000 (17:00 +0000)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Sun, 6 Dec 2009 17:00:33 +0000 (17:00 +0000)
commit3d14b5beba35250c548d3851a2b84fce742d8311
tree065e3d93c3fcbc5ee4c44fa78662393cddbdf6de
parent0719dc341389882cc834ed18fc9b7fc6006b2b85
parent1bf8e6219552d5dd27012d567ec8c4bb9c2d86b4
Merge branch 'sa1100' into devel
MAINTAINERS
drivers/mmc/host/pxamci.c