diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-01-05 13:09:03 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-01-05 13:09:03 -0500 |
| commit | 58daf18cdcab550262a5f4681e1f1e073e21965a (patch) | |
| tree | 2096324b947761a567dd451f33664f17ee1de2cd /arch/arm/mach-omap2/timer-mpu.c | |
| parent | aa312be1987d43216e72ffce42bccf6bf81f62ed (diff) | |
| parent | 0af85dda39d9b673aca8c0ebae004ea70f3efc93 (diff) | |
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/mach-omap2/timer-mpu.c')
0 files changed, 0 insertions, 0 deletions