summaryrefslogtreecommitdiff
path: root/arch/arm/mach-omap2/omap44xx-smc.S
diff options
context:
space:
mode:
authorKevin Hilman <khilman@deeprootsystems.com>2010-10-02 00:24:10 +0400
committerKevin Hilman <khilman@deeprootsystems.com>2010-10-02 00:24:10 +0400
commit69758ab7a1e2de5636a2188d5357dd03140bf1d8 (patch)
tree13d65cbee4cc6bfed697bd164a15529ad86c2b25 /arch/arm/mach-omap2/omap44xx-smc.S
parent963bfb0939232e415c7bfb19b08dce300eb148d9 (diff)
parent257f23d87f9309fee41d468575404b9371bf4c7d (diff)
downloadlinux-69758ab7a1e2de5636a2188d5357dd03140bf1d8.tar.xz
manual merge for pm-hwmod-uart due to conflicts
Diffstat (limited to 'arch/arm/mach-omap2/omap44xx-smc.S')
0 files changed, 0 insertions, 0 deletions