Merge git://git.kernel.org/pub/scm/linux/kernel/git/nico/orion into devel-stable
authorRussell King <rmk+kernel@arm.linux.org.uk>
Mon, 16 May 2011 22:06:49 +0000 (23:06 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Mon, 16 May 2011 22:06:49 +0000 (23:06 +0100)

Trivial merge