aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-mxs/Makefile
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2012-01-06 18:09:14 -0500
committerArnd Bergmann <arnd@arndb.de>2012-01-06 18:09:14 -0500
commite067096c8d57d191f29d734cd5692695c95cc36e (patch)
treee1c200404c3ed3730d04837113d59ca898eb483a /arch/arm/mach-mxs/Makefile
parent1fc3eb81100c3f3cd44e706e54390151b0f1ce74 (diff)
parente5570bbc9c06634cfac94e06ac1432b53d8595e5 (diff)
Merge branch 'tegra/soc' into next/boards
Conflicts: arch/arm/mach-tegra/board-harmony-pcie.c To fix an internal merge conflict between the tegra/soc and tegra/boards branches. Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/mach-mxs/Makefile')
0 files changed, 0 insertions, 0 deletions