diff options
author | Kukjin Kim <kgene.kim@samsung.com> | 2012-11-20 18:19:10 +0900 |
---|---|---|
committer | Kukjin Kim <kgene.kim@samsung.com> | 2012-11-20 18:19:10 +0900 |
commit | 840ed42942cc1ebbda2ed55f4019673b537fc5de (patch) | |
tree | 415644488e3966837eeb5061d96d4ca7db862318 /arch/arm/mach-spear13xx | |
parent | 0dca30003bc752b2fc15906e562ef4e4925725fd (diff) | |
parent | 0a9d5ac307aefbb2c772537d3fe7f75046d563ac (diff) | |
download | blackbird-op-linux-840ed42942cc1ebbda2ed55f4019673b537fc5de.tar.gz blackbird-op-linux-840ed42942cc1ebbda2ed55f4019673b537fc5de.zip |
Merge branch 'next/hdmi-samsung' into next/devel-samsung
Diffstat (limited to 'arch/arm/mach-spear13xx')
-rw-r--r-- | arch/arm/mach-spear13xx/include/mach/spear1310_misc_regs.h | 0 | ||||
-rw-r--r-- | arch/arm/mach-spear13xx/include/mach/spear1340_misc_regs.h | 0 |
2 files changed, 0 insertions, 0 deletions
diff --git a/arch/arm/mach-spear13xx/include/mach/spear1310_misc_regs.h b/arch/arm/mach-spear13xx/include/mach/spear1310_misc_regs.h deleted file mode 100644 index e69de29bb2d1..000000000000 --- a/arch/arm/mach-spear13xx/include/mach/spear1310_misc_regs.h +++ /dev/null diff --git a/arch/arm/mach-spear13xx/include/mach/spear1340_misc_regs.h b/arch/arm/mach-spear13xx/include/mach/spear1340_misc_regs.h deleted file mode 100644 index e69de29bb2d1..000000000000 --- a/arch/arm/mach-spear13xx/include/mach/spear1340_misc_regs.h +++ /dev/null |