Merge branch 'hyp-boot-mode-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorRussell King <rmk+kernel@arm.linux.org.uk>
Sun, 30 Sep 2012 08:03:44 +0000 (09:03 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Sun, 30 Sep 2012 08:03:44 +0000 (09:03 +0100)

Trivial merge