Merge branch 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/nico/orion
authorRussell King <[email protected]>
Thu, 23 Sep 2010 10:52:04 +0000 (11:52 +0100)
committerRussell King <[email protected]>
Thu, 23 Sep 2010 10:52:04 +0000 (11:52 +0100)

Trivial merge