Merge branch 'cleanup' into tmp-merge
authorTony Lindgren <tony@atomide.com>
Fri, 29 Jun 2012 14:28:24 +0000 (07:28 -0700)
committerTony Lindgren <tony@atomide.com>
Fri, 29 Jun 2012 14:28:24 +0000 (07:28 -0700)
Conflicts:
arch/arm/mach-omap2/clockdomains3xxx_data.c


Trivial merge