aboutsummaryrefslogtreecommitdiff
path: root/arch/arm/mach-ixp23xx/include/mach/system.h
diff options
context:
space:
mode:
authorRussell King <rmk@dyn-67.arm.linux.org.uk>2009-03-19 12:39:58 +0000
committerRussell King <rmk+kernel@arm.linux.org.uk>2009-03-19 12:39:58 +0000
commit14b6848bc0134b8838d374c423df3edda9b1490e (patch)
tree724dc912efe84f432d33a798502811c5f5295774 /arch/arm/mach-ixp23xx/include/mach/system.h
parent05d9881bc4c6f172997b7a59e4a1a95910c4ebd7 (diff)
parent4da3782151300237db3abe070f716922889252e0 (diff)
downloadlinux-2.6.34-ux500-14b6848bc0134b8838d374c423df3edda9b1490e.tar.gz
Merge branch 'omap-clks3' into devel
Conflicts: arch/arm/mach-omap2/clock.c
Diffstat (limited to 'arch/arm/mach-ixp23xx/include/mach/system.h')
0 files changed, 0 insertions, 0 deletions