Merge branch 'omap-clock-upstream'
authorTony Lindgren <tony@atomide.com>
Mon, 15 Jun 2009 08:19:37 +0000 (11:19 +0300)
committerTony Lindgren <tony@atomide.com>
Mon, 15 Jun 2009 08:19:37 +0000 (11:19 +0300)

Trivial merge