Merge branch 'prcm-cleanup-3.1' of git://git.pwsan.com/linux-2.6 into tmp-rebuild...
authorTony Lindgren <tony@atomide.com>
Sun, 10 Jul 2011 20:07:11 +0000 (13:07 -0700)
committerTony Lindgren <tony@atomide.com>
Sun, 10 Jul 2011 20:07:11 +0000 (13:07 -0700)
Conflicts:
arch/arm/mach-omap2/cm-regbits-44xx.h


Trivial merge