projects / firefly-linux-kernel-4.4.55.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: b2f1df8 ed1b4ac)
Merge branch 'tegra/cleanups' into next/timer
authorArnd Bergmann <arnd@arndb.de>
Wed, 21 Mar 2012 14:27:34 +0000 (14:27 +0000)
committerArnd Bergmann <arnd@arndb.de>
Wed, 21 Mar 2012 14:27:34 +0000 (14:27 +0000)
commit2cbe23e3a432e3d09a849adb197c8fcc09e7391d
tree711fe5845c4c7e7eaf8c57a597d86c0f9dda5b06tree | snapshot
parentb2f1df8d2fc14bf7e6d9d967043d4b60c2efd8dccommit | diff
parented1b4acc43b0c3289faa30cf184f322ab70a5be3commit | diff
Merge branch 'tegra/cleanups' into next/timer

Conflicts:
arch/arm/mach-tegra/Makefile
arch/arm/mach-vexpress/core.h

The tegra Makefile was changed in four different branches
in the same line. This merge should reduce the amount
of churn.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
12 files changed:
arch/arm/Kconfig diff1 | diff2 | blob | history
arch/arm/mach-nomadik/board-nhk8815.c diff1 | diff2 | blob | history
arch/arm/mach-omap2/pm24xx.c diff1 | diff2 | blob | history
arch/arm/mach-realview/realview_eb.c diff1 | diff2 | blob | history
arch/arm/mach-realview/realview_pb11mp.c diff1 | diff2 | blob | history
arch/arm/mach-realview/realview_pbx.c diff1 | diff2 | blob | history
arch/arm/mach-tegra/Makefile diff1 | diff2 | blob | history
arch/arm/mach-vexpress/core.h diff1 | diff2 | blob | history
arch/arm/mach-vexpress/ct-ca9x4.c diff1 | diff2 | blob | history
arch/arm/mach-vexpress/include/mach/ct-ca9x4.h diff1 | diff2 | blob | history
arch/arm/mach-vexpress/v2m.c diff1 | diff2 | blob | history
drivers/mmc/host/mmci.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.