Merge branch 'cluster-boot-protocol' of git://linux-arm.org/linux-2.6-lp into devel...
authorRussell King <rmk+kernel@arm.linux.org.uk>
Tue, 20 Nov 2012 20:18:51 +0000 (20:18 +0000)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Tue, 20 Nov 2012 20:18:51 +0000 (20:18 +0000)

Trivial merge