Merge branch 'for-russell' of git://codeaurora.org/quic/kernel/dwalker/linux-msm...
authorRussell King <rmk+kernel@arm.linux.org.uk>
Fri, 7 May 2010 20:40:43 +0000 (21:40 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Fri, 7 May 2010 20:40:43 +0000 (21:40 +0100)

Trivial merge