]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'cleanup-hwmod' into cleanup
authorTony Lindgren <tony@atomide.com>
Thu, 28 Jun 2012 12:47:01 +0000 (05:47 -0700)
committerTony Lindgren <tony@atomide.com>
Thu, 28 Jun 2012 12:47:01 +0000 (05:47 -0700)
commitc6dd92c6ab1f90ad719ee5e6cf8b99ba1df84f1e
tree2b026da522975ca03bfcdd80b66bb266ed6553a9
parente55af5c7c198ae82d8b5d5eeda351064be14b336
parentf4055f9267c9f6c4b65d620b983e04c596d1a8ab
Merge branch 'cleanup-hwmod' into cleanup

Conflicts:
arch/arm/mach-omap2/dsp.c
arch/arm/mach-omap2/Makefile
arch/arm/mach-omap2/clock3xxx_data.c
arch/arm/mach-omap2/dsp.c
arch/arm/mach-omap2/omap_hwmod.c
arch/arm/mach-omap2/omap_hwmod_44xx_data.c