summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-s5p64x0
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2012-02-27 15:58:53 +0100
committerArnd Bergmann <arnd@arndb.de>2012-02-27 15:58:53 +0100
commita3a3c4664184f86ef964323d106c62158e2b3f25 (patch)
treea9b10a59f5ad8c2ac0196fca9b4e1eeaf75dbb4b /arch/arm/mach-s5p64x0
parentMerge branch 'imx-cleanup' of git://git.pengutronix.de/git/imx/linux-2.6 into... (diff)
parentARM: davinci: add back dummy header files (diff)
downloadlinux-a3a3c4664184f86ef964323d106c62158e2b3f25.tar.xz
linux-a3a3c4664184f86ef964323d106c62158e2b3f25.zip
Merge branch 'davinci/cleanups' into next/cleanup
* davinci/cleanups: ARM: davinci: add back dummy header files ARM: davinci: dm644x: don't force vpfe registeration on all boards ARM: davinci: dm644x: fix inconsistent variable naming ARM: davinci: dm644x: improve readability using macro ARM: davinci: streamline sysmod access ARM: davinci: create new common platform header for davinci ARM: davinci: dm646x: move private definitions to C file ARM: davinci: dm365: move private definitions to C file ARM: davinci: dm644x: move private definitions to C file Conflicts: arch/arm/mach-davinci/board-dm644x-evm.c arch/arm/mach-davinci/board-neuros-osd2.c arch/arm/mach-davinci/board-sffsdr.c
Diffstat (limited to 'arch/arm/mach-s5p64x0')
0 files changed, 0 insertions, 0 deletions