Public
  1. Public

linux-phytec-ti

Public

Commits

Paul Walmsley
21ace5452ce + cc1226e7635
Paul Walmsley committed 2d403fe0307M
Merge remote branch 'remotes/origin/hwmod_a_2.6.39' into tmp-integration-2.6.39-20110310-024

Conflicts:
	arch/arm/mach-omap2/omap_hwmod_2430_data.c
	arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
	arch/arm/plat-omap/include/plat/omap_hwmod.h
Showing diff tocc1226e7635