diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-10-08 15:47:06 -0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-10-08 15:47:06 -0400 |
| commit | a3849a4c038a21075a0bc7eaf37f65a93976d10c (patch) | |
| tree | 77e1148cdd719856dcf1692f8d9167691347d17b /arch/s390/kernel/relocate_kernel.S | |
| parent | 71f2c153755442c05d15cd025484f676a5f3541f (diff) | |
| parent | 1bf6d2c1bb23533af6930581cc39b74685bc29de (diff) | |
Merge branch 'stericsson/fixes' into next/cleanup
Conflicts:
arch/arm/mach-ux500/cpu.c
Diffstat (limited to 'arch/s390/kernel/relocate_kernel.S')
0 files changed, 0 insertions, 0 deletions