Merge git://git.kernel.org/pub/scm/linux/kernel/git/nico/orion
authorRussell King <rmk+kernel@arm.linux.org.uk>
Sun, 7 Nov 2010 16:10:56 +0000 (16:10 +0000)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Sun, 7 Nov 2010 16:10:56 +0000 (16:10 +0000)

Trivial merge