Merge branch 'msm-core' of git://codeaurora.org/quic/kernel/dwalker/linux-msm into...
authorRussell King <rmk+kernel@arm.linux.org.uk>
Tue, 19 Oct 2010 18:55:59 +0000 (19:55 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Tue, 19 Oct 2010 18:55:59 +0000 (19:55 +0100)

Trivial merge