Merge branch 'omap-clock-fixes' of git://git.pwsan.com/linux-2.6
authorTony Lindgren <tony@atomide.com>
Fri, 10 Apr 2009 19:03:31 +0000 (12:03 -0700)
committerTony Lindgren <tony@atomide.com>
Fri, 10 Apr 2009 19:03:31 +0000 (12:03 -0700)
Conflicts:
arch/arm/mach-omap2/board-omap3beagle.c


Trivial merge