Merge branch 'devicetree/arm-next' of git://git.secretlab.ca/git/linux-2.6 into devel...
authorRussell King <rmk+kernel@arm.linux.org.uk>
Tue, 24 May 2011 23:08:17 +0000 (00:08 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Tue, 24 May 2011 23:08:17 +0000 (00:08 +0100)

Trivial merge