Merge git://git.kernel.org/pub/scm/linux/kernel/git/nico/orion into fixes
authorRussell King <rmk+kernel@arm.linux.org.uk>
Mon, 28 Mar 2011 17:57:19 +0000 (18:57 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Mon, 28 Mar 2011 17:57:19 +0000 (18:57 +0100)

Trivial merge