git.karo-electronics.de Git - linux-beck.git/commit

author	Tony Lindgren <tony@atomide.com>
	Thu, 10 May 2012 16:39:05 +0000 (09:39 -0700)
committer	Tony Lindgren <tony@atomide.com>
	Thu, 10 May 2012 16:39:05 +0000 (09:39 -0700)
commit	640ec79d6d8c10ceb254c269a1f7fd9cb47ea655
tree	e13bf414bc1a9c2e35889441b93443865e2eb14c	tree \| snapshot
parent	7a8bcf067d2b11964cb83ce3d753ac2d3ab9843c	commit \| diff
parent	cf563a35888ee92361c324dfc57b328c84653c5b	commit \| diff

Merge branch 'cleanup-soc' into cleanup

Conflicts:
arch/arm/mach-omap2/Makefile