summaryrefslogtreecommitdiffstats
path: root/arch/arm/kernel/arch_timer.c
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2012-10-04 23:01:55 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2012-10-04 23:01:55 +0100
commitba4a63f89c8f8a014450e45fd96a06a5e078e52f (patch)
tree87466c6a1abe43b384bd7bf4118b75af1d28293b /arch/arm/kernel/arch_timer.c
parent43a60c1792b13eed49220af0e1344bf48e3a0677 (diff)
parent9d4876f039a086eeb599a8fac684c9a8daa64ab1 (diff)
parent7253b85cc62d6ff84143d96fe6cd54f73736f4d7 (diff)
parent73efd53012af7775a4504da46ebf4145528d50e7 (diff)
parenta3d7193e3c5d0b2365b9247ef0d4cb549187f32f (diff)
parent508514ed25315dd28340000831b17535d6f772da (diff)
parentebb5e15c3eb942c047108063423d5d6a04b9f167 (diff)
Merge branches 'atags', 'cache-l2x0', 'clkdev', 'fixes', 'integrator', 'misc', 'opcodes' and 'syscall' into for-linus