Merge branch 'for-rmk/virt/psci' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorRussell King <rmk+kernel@arm.linux.org.uk>
Wed, 23 Jan 2013 22:44:13 +0000 (22:44 +0000)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Wed, 23 Jan 2013 22:44:13 +0000 (22:44 +0000)

Trivial merge