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)
commit640ec79d6d8c10ceb254c269a1f7fd9cb47ea655
treee13bf414bc1a9c2e35889441b93443865e2eb14c
parent7a8bcf067d2b11964cb83ce3d753ac2d3ab9843c
parentcf563a35888ee92361c324dfc57b328c84653c5b
Merge branch 'cleanup-soc' into cleanup

Conflicts:
arch/arm/mach-omap2/Makefile
arch/arm/mach-omap2/Makefile