Merge git://git.kernel.org/pub/scm/linux/kernel/git/nico/orion into devel-stable
authorRussell King <rmk+kernel@arm.linux.org.uk>
Wed, 21 Jul 2010 08:22:45 +0000 (09:22 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Wed, 21 Jul 2010 08:22:45 +0000 (09:22 +0100)

Trivial merge