diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-03-21 15:27:34 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-03-21 15:27:34 +0100 |
| commit | 2cbe23e3a432e3d09a849adb197c8fcc09e7391d (patch) | |
| tree | 711fe5845c4c7e7eaf8c57a597d86c0f9dda5b06 /drivers/misc/eeprom/max6875.c | |
| parent | Merge branch 'renesas/timer' into next/timer (diff) | |
| parent | Merge branch 'for-3.4/cleanup-and-fixes' of git://git.kernel.org/pub/scm/linu... (diff) | |
| download | linux-2cbe23e3a432e3d09a849adb197c8fcc09e7391d.tar.xz linux-2cbe23e3a432e3d09a849adb197c8fcc09e7391d.zip | |
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>
Diffstat (limited to 'drivers/misc/eeprom/max6875.c')
0 files changed, 0 insertions, 0 deletions