Merge branch 'cleanup-soc' into cleanup

Conflicts:
	arch/arm/mach-omap2/Makefile
This commit is contained in:
Tony Lindgren 2012-05-10 09:39:05 -07:00
commit 640ec79d6d
8 changed files with 95 additions and 162 deletions