Merge branch 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux...
authorRussell King <rmk@dyn-67.arm.linux.org.uk>
Mon, 27 Apr 2009 17:06:24 +0000 (18:06 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Mon, 27 Apr 2009 17:06:24 +0000 (18:06 +0100)

Trivial merge