Merge branch 'sa11x0-mtd' into sa11x0
authorRussell King <rmk+kernel@arm.linux.org.uk>
Sun, 25 Mar 2012 22:55:23 +0000 (23:55 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Sun, 25 Mar 2012 22:55:43 +0000 (23:55 +0100)
commite7d863d0f42e2cf19a13c867bfcab7424388bff8
treef1e5cdddd5eec14e5e0ec184162b2f65435ace80
parentc21320104ec5b8ffa0d62865d43ee56cbfccc2de
parenta6e68168f1c8a303116778d7213d64e0f67b9340
Merge branch 'sa11x0-mtd' into sa11x0