Merge branch 'for_rmk' of git://git.linaro.org/kernel/linux-linaro-next into devel...
authorRussell King <rmk+kernel@arm.linux.org.uk>
Mon, 4 Oct 2010 21:23:26 +0000 (22:23 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Mon, 4 Oct 2010 21:23:30 +0000 (22:23 +0100)

Trivial merge