diff options
| author | Jon Medhurst <tixy@linaro.org> | 2012-07-18 19:03:24 +0100 |
|---|---|---|
| committer | Jon Medhurst <tixy@linaro.org> | 2012-07-18 19:03:24 +0100 |
| commit | 2d4e3b16f288d63a8fb21ee14fcece92f3548f55 (patch) | |
| tree | 56656e81ae988c22984a9743cd6605fa35b794d5 /arch/arm/mm/proc-v7-3level.S | |
| parent | 200f50b540e8fc7ce3a23f84c0cc06115b95edb2 (diff) | |
| parent | 7089909f914cc27f4fb5943392bbb2be2b9446f3 (diff) | |
Merge branch 'tracking-armlt-tc2' into integration-linux-vexpress
Conflicts:
arch/arm/mach-vexpress/v2m.c
Diffstat (limited to 'arch/arm/mm/proc-v7-3level.S')
0 files changed, 0 insertions, 0 deletions