Merge branch 'cleanup-soc' into cleanup
authorTony Lindgren <tony@atomide.com>
Thu, 10 May 2012 16:39:05 +0000 (09:39 -0700)
committerTony Lindgren <tony@atomide.com>
Thu, 10 May 2012 16:39:05 +0000 (09:39 -0700)
Conflicts:
arch/arm/mach-omap2/Makefile


Trivial merge