manual merge for pm-hwmod-uart due to conflicts
authorKevin Hilman <khilman@deeprootsystems.com>
Fri, 1 Oct 2010 20:24:10 +0000 (13:24 -0700)
committerKevin Hilman <khilman@deeprootsystems.com>
Fri, 1 Oct 2010 20:24:10 +0000 (13:24 -0700)
commit69758ab7a1e2de5636a2188d5357dd03140bf1d8
tree13d65cbee4cc6bfed697bd164a15529ad86c2b25
parent963bfb0939232e415c7bfb19b08dce300eb148d9
parent257f23d87f9309fee41d468575404b9371bf4c7d
manual merge for pm-hwmod-uart due to conflicts
arch/arm/mach-omap2/omap_hwmod_2420_data.c
arch/arm/mach-omap2/omap_hwmod_2430_data.c
arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
arch/arm/mach-omap2/omap_hwmod_44xx_data.c