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 /arch/arm/mach-mmp/include/mach/pxa168.h | |
| parent | 65af7c4608f7b7019e2faa220fb9624988965873 (diff) | |
| parent | 76525ec214449318f793ff05fa5b0ecd0afe41cd (diff) | |
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 'arch/arm/mach-mmp/include/mach/pxa168.h')
0 files changed, 0 insertions, 0 deletions