Merge branch 'kexec/idmap' of git://git.kernel.org/pub/scm/linux/kernel/git/will...
authorRussell King <rmk+kernel@arm.linux.org.uk>
Tue, 6 Dec 2011 20:27:54 +0000 (20:27 +0000)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Tue, 6 Dec 2011 20:27:54 +0000 (20:27 +0000)

Trivial merge