diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-10-08 21:47:06 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-10-08 21:47:06 +0200 |
| commit | a3849a4c038a21075a0bc7eaf37f65a93976d10c (patch) | |
| tree | 77e1148cdd719856dcf1692f8d9167691347d17b /arch/arm/plat-s5p | |
| parent | Merge branch 'depends/rmk/devel-stable' into next/cleanup (diff) | |
| parent | ARM: mach-ux500: unlock I&D l2x0 caches before init (diff) | |
| download | linux-a3849a4c038a21075a0bc7eaf37f65a93976d10c.tar.xz linux-a3849a4c038a21075a0bc7eaf37f65a93976d10c.zip | |
Merge branch 'stericsson/fixes' into next/cleanup
Conflicts:
arch/arm/mach-ux500/cpu.c
Diffstat (limited to 'arch/arm/plat-s5p')
0 files changed, 0 insertions, 0 deletions