Merge branch 'omap-clock-for-next' of git://git.pwsan.com/linux-2.6 into devel
authorRussell King <rmk@dyn-67.arm.linux.org.uk>
Sat, 20 Jun 2009 09:57:40 +0000 (10:57 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Sat, 20 Jun 2009 09:57:40 +0000 (10:57 +0100)

Trivial merge