Merge branch 'for-russell' of git://codeaurora.org/quic/kernel/dwalker/linux-msm...
authorRussell King <rmk+kernel@arm.linux.org.uk>
Fri, 8 Oct 2010 09:06:58 +0000 (10:06 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Fri, 8 Oct 2010 09:06:58 +0000 (10:06 +0100)

Trivial merge