Merge branch 'cleanup-part2' into tmp-merge
authorTony Lindgren <tony@atomide.com>
Fri, 6 Jul 2012 11:59:38 +0000 (04:59 -0700)
committerTony Lindgren <tony@atomide.com>
Fri, 6 Jul 2012 11:59:38 +0000 (04:59 -0700)
Conflicts:
arch/arm/mach-omap2/prm2xxx_3xxx.h


Trivial merge