diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-01-05 19:09:03 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-01-05 19:09:03 +0100 |
| commit | 58daf18cdcab550262a5f4681e1f1e073e21965a (patch) | |
| tree | 2096324b947761a567dd451f33664f17ee1de2cd /arch/arm/mm/proc-v7.S | |
| parent | Merge branches 'mmci' and 'pl011-dma' into devel (diff) | |
| parent | ARM: vexpress: add sched_clock() for Versatile Express (diff) | |
| download | linux-58daf18cdcab550262a5f4681e1f1e073e21965a.tar.xz linux-58daf18cdcab550262a5f4681e1f1e073e21965a.zip | |
Merge branch 'clksrc' into devel
Conflicts:
arch/arm/mach-vexpress/v2m.c
arch/arm/plat-omap/counter_32k.c
arch/arm/plat-versatile/Makefile
Diffstat (limited to 'arch/arm/mm/proc-v7.S')
0 files changed, 0 insertions, 0 deletions