summaryrefslogtreecommitdiffstats
path: root/drivers/clocksource/cs5535-clockevt.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-03-24 01:19:37 +0100
committerLinus Torvalds <torvalds@linux-foundation.org>2012-03-24 01:19:37 +0100
commit0e65ae099ca6a70a7a521e0358c57d43ec95dce5 (patch)
treeab4b11ec028229530ad1f616b80e6ea1057d0e71 /drivers/clocksource/cs5535-clockevt.c
parentMerge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/ker... (diff)
parentDocumentation/kernel-parameters: remove inttest parameter (diff)
downloadlinux-0e65ae099ca6a70a7a521e0358c57d43ec95dce5.tar.xz
linux-0e65ae099ca6a70a7a521e0358c57d43ec95dce5.zip
Merge tag 'ia64-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux
Pull miscellaneous Itanium patches from Tony Luck. The conflicts in arch/ia64/hp/sim/simserial.c were due to patches to simserial that had alredy been included (with lots of further cleanups) in the serial tree. * tag 'ia64-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux: Documentation/kernel-parameters: remove inttest parameter [IA64] Fix ISA IRQ trigger model and polarity setting [IA64] Fix a couple of warnings for EXPORT_SYMBOL [IA64] Check return from device_register() in cx_device_register() [IA64] Fix warning from machine_kexec.c [IA64] simserial, bail out when request_irq fails [IA64] hpsim, initialize chip for assigned irqs [IA64] simserial, include some headers [IA64] hpsim, fix SAL handling in fw-emu [IA64] genirq fixup for SGI/SN [IA64] disable interrupts when exiting from ia64_mca_cmc_int_handler()
Diffstat (limited to 'drivers/clocksource/cs5535-clockevt.c')
0 files changed, 0 insertions, 0 deletions