Merge branches 'ftrace', 'gic', 'io', 'kexec', 'mod', 'sa11x0', 'sh' and 'versatile...
authorRussell King <rmk+kernel@arm.linux.org.uk>
Wed, 5 Jan 2011 18:08:10 +0000 (18:08 +0000)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Wed, 5 Jan 2011 18:08:10 +0000 (18:08 +0000)

Trivial merge