Merge git://git.kernel.org/pub/scm/linux/kernel/git/nico/orion into devel-stable
authorRussell King <rmk+kernel@arm.linux.org.uk>
Sat, 18 Dec 2010 14:28:31 +0000 (14:28 +0000)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Sat, 18 Dec 2010 14:28:31 +0000 (14:28 +0000)

Trivial merge