summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-omap1/time.c
diff options
context:
space:
mode:
authorRussell King <rmk@dyn-67.arm.linux.org.uk>2007-05-06 20:58:29 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2007-05-06 20:58:29 +0100
commit5cd47155155a32e5b944ac9fc3f3dc578e429aa0 (patch)
treeea05bfdbae04eb5ffbafa2c58fc68897a3f541d6 /arch/arm/mach-omap1/time.c
parent6f95416ebe81b3ad63884538555efb81cb05749f (diff)
parent28bd3a0dcce11bea6f99a351cc64053dff00196e (diff)
downloadlinux-5cd47155155a32e5b944ac9fc3f3dc578e429aa0.tar.gz
linux-5cd47155155a32e5b944ac9fc3f3dc578e429aa0.tar.bz2
linux-5cd47155155a32e5b944ac9fc3f3dc578e429aa0.zip
Merge branch 'ixp4xx' into devel
Conflicts: include/asm-arm/arch-ixp4xx/io.h
Diffstat (limited to 'arch/arm/mach-omap1/time.c')
0 files changed, 0 insertions, 0 deletions