Merge branch 'omap-clock-upstream'
authorTony Lindgren <tony@atomide.com>
Mon, 15 Jun 2009 09:48:39 +0000 (12:48 +0300)
committerTony Lindgren <tony@atomide.com>
Mon, 15 Jun 2009 09:48:39 +0000 (12:48 +0300)

Trivial merge