diff options
author | Kevin Hilman <khilman@deeprootsystems.com> | 2010-10-01 22:24:10 +0200 |
---|---|---|
committer | Kevin Hilman <khilman@deeprootsystems.com> | 2010-10-01 22:24:10 +0200 |
commit | 69758ab7a1e2de5636a2188d5357dd03140bf1d8 (patch) | |
tree | 13d65cbee4cc6bfed697bd164a15529ad86c2b25 /arch/arm/mach-omap1/devices.c | |
parent | Merge branch 'pm-hwmod-wdog' into pm-hwmods (diff) | |
parent | OMAP3: SERIAL: Initialize all omap-uarts for zoom boards (diff) | |
download | linux-69758ab7a1e2de5636a2188d5357dd03140bf1d8.tar.xz linux-69758ab7a1e2de5636a2188d5357dd03140bf1d8.zip |
manual merge for pm-hwmod-uart due to conflicts
Diffstat (limited to 'arch/arm/mach-omap1/devices.c')
0 files changed, 0 insertions, 0 deletions