Merge branch 'arm/clock-event' of git://git.pengutronix.de/git/ukl/linux-2.6 into...
authorRussell King <rmk+kernel@arm.linux.org.uk>
Mon, 15 Feb 2010 21:20:33 +0000 (21:20 +0000)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Mon, 15 Feb 2010 21:20:33 +0000 (21:20 +0000)

Trivial merge