diff options
| author |   Arnd Bergmann <arnd@arndb.de> | 2011-10-31 23:42:23 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-10-31 23:42:23 +0100 |
| commit | eed1e576507b52e03e549e0c9e0c747978122403 (patch) | |
| tree | 69a7ecac041f83b0299f55a760f4f0cd5767ae05 /fs/jbd2/commit.c | |
| parent | Merge branches 'stericsson/timer' and 'omap/dmtimer' into next/timer (diff) | |
| parent | mach-ux500: remove pull-pinconfig and add SPI2 (diff) | |
| download | linux-rng-eed1e576507b52e03e549e0c9e0c747978122403.tar.xz linux-rng-eed1e576507b52e03e549e0c9e0c747978122403.zip | |
Merge branch 'stericsson/cleanup' into next/timer
The timer and cleanup branches from stericsson conflict,
so I'm merging them here.
Conflicts:
arch/arm/mach-ux500/Makefile
arch/arm/mach-ux500/cpu.c
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'fs/jbd2/commit.c')
0 files changed, 0 insertions, 0 deletions