Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman...
authorRussell King <rmk@dyn-67.arm.linux.org.uk>
Fri, 29 May 2009 09:04:24 +0000 (10:04 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Fri, 29 May 2009 09:04:24 +0000 (10:04 +0100)

Trivial merge