summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-tegra/board-harmony-pcie.c
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2012-01-05 14:25:15 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2012-01-05 14:25:27 +0100
commit7b9dd47136c07ffd883aff6926c7b281e4c1eea4 (patch)
treeb835312e76fe323de3e1cbbb0d15fca5a3f7ef9c /arch/arm/mach-tegra/board-harmony-pcie.c
parentMerge branch 'devel-stable' into for-linus (diff)
parentARM: 7198/1: arm/imx6: add restart support for imx6q (diff)
downloadlinux-7b9dd47136c07ffd883aff6926c7b281e4c1eea4.tar.xz
linux-7b9dd47136c07ffd883aff6926c7b281e4c1eea4.zip
Merge branch 'restart' into for-linus
Conflicts: arch/arm/mach-exynos/cpu.c The changes to arch/arm/mach-exynos/cpu.c were moved to mach-exynos/common.c.
Diffstat (limited to 'arch/arm/mach-tegra/board-harmony-pcie.c')
0 files changed, 0 insertions, 0 deletions