Merge branch 'cleanup-soc' into cleanup
authorTony Lindgren <tony@atomide.com>
Tue, 8 May 2012 17:18:17 +0000 (10:18 -0700)
committerTony Lindgren <tony@atomide.com>
Tue, 8 May 2012 17:18:17 +0000 (10:18 -0700)
Conflicts:
arch/arm/mach-omap2/Makefile


Trivial merge