aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-davinci/include/mach/clock.h
diff options
context:
space:
mode:
authorRussell King <rmk@dyn-67.arm.linux.org.uk>2009-06-11 10:35:00 -0400
committerRussell King <rmk+kernel@arm.linux.org.uk>2009-06-11 10:35:00 -0400
commit42578c82e0f1810a07ebe29cb05e874893243d8c (patch)
treee2a3811677d3594e891fc82c940438f6b6abc3e0 /arch/arm/mach-davinci/include/mach/clock.h
parent2631182bf93919577730e6a6c4345308db590057 (diff)
parent85d6943af50537d3aec58b967ffbd3fec88453e9 (diff)
Merge branch 'for-rmk' of git://linux-arm.org/linux-2.6 into devel
Conflicts: arch/arm/Kconfig arch/arm/kernel/smp.c arch/arm/mach-realview/Makefile arch/arm/mach-realview/platsmp.c
Diffstat (limited to 'arch/arm/mach-davinci/include/mach/clock.h')
0 files changed, 0 insertions, 0 deletions