diff options
| author | Russell King | 2011-01-06 23:31:35 +0100 |
|---|---|---|
| committer | Russell King | 2011-01-06 23:32:03 +0100 |
| commit | 4ec3eb13634529c0bc7466658d84d0bbe3244aea (patch) | |
| tree | b491daac2ccfc7b8ca88e171a43f66888463568a /arch/arm/mm/proc-v7.S | |
| parent | ARM: DMA: add support for DMA debugging (diff) | |
| parent | ARM: TWD: enable one-shot mode (diff) | |
| download | kernel-qcow2-linux-4ec3eb13634529c0bc7466658d84d0bbe3244aea.tar.gz kernel-qcow2-linux-4ec3eb13634529c0bc7466658d84d0bbe3244aea.tar.xz kernel-qcow2-linux-4ec3eb13634529c0bc7466658d84d0bbe3244aea.zip | |
Merge branch 'smp' into misc
Conflicts:
arch/arm/kernel/entry-armv.S
arch/arm/mm/ioremap.c
Diffstat (limited to 'arch/arm/mm/proc-v7.S')
0 files changed, 0 insertions, 0 deletions