aboutsummaryrefslogtreecommitdiff
path: root/arch/arm/mach-nuc93x/include/mach/regs-timer.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-03-03 09:25:37 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2010-03-03 09:25:37 -0800
commiteaa5eec739637f32f8733d528ff0b94fd62b1214 (patch)
treec9568668b920ad677b9a82be02e83b173d20c7d5 /arch/arm/mach-nuc93x/include/mach/regs-timer.h
parent2a32f2db132264c356aea30a8270d3e68d96c509 (diff)
parentd95cf4de6a1c9c1025ac375bc6d2da6af18fdf35 (diff)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp: amd64_edac: Simplify ECC override handling
Diffstat (limited to 'arch/arm/mach-nuc93x/include/mach/regs-timer.h')
0 files changed, 0 insertions, 0 deletions