Merge master.kernel.org:/pub/scm/linux/kernel/git/lethal/genesis-2.6
authorRussell King <rmk+kernel@arm.linux.org.uk>
Wed, 1 Sep 2010 09:06:21 +0000 (10:06 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Wed, 1 Sep 2010 09:06:21 +0000 (10:06 +0100)

Trivial merge