Merge branch 'for_2.6.33rc_b' of git://git.pwsan.com/linux-2.6 into omap-fixes-for...
authorTony Lindgren <tony@atomide.com>
Thu, 7 Jan 2010 01:28:49 +0000 (17:28 -0800)
committerTony Lindgren <tony@atomide.com>
Thu, 7 Jan 2010 01:28:49 +0000 (17:28 -0800)
Conflicts:
arch/arm/plat-omap/clock.c


Trivial merge