Merge branches 'at91', 'dcache', 'ftrace', 'hwbpt', 'misc', 'mmci', 's3c', 'st-ux...
authorRussell King <rmk+kernel@arm.linux.org.uk>
Mon, 18 Oct 2010 21:34:25 +0000 (22:34 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Mon, 18 Oct 2010 21:34:25 +0000 (22:34 +0100)

Trivial merge