Merge branch 'omap-clock-upstream' of git://git.pwsan.com/linux-2.6 into for-next
authorTony Lindgren <tony@atomide.com>
Tue, 26 May 2009 21:41:35 +0000 (14:41 -0700)
committerTony Lindgren <tony@atomide.com>
Tue, 26 May 2009 21:41:35 +0000 (14:41 -0700)

Trivial merge