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)

Trivial merge