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()
Showing
- Documentation/kernel-parameters.txt 0 additions, 2 deletionsDocumentation/kernel-parameters.txt
- arch/ia64/kernel/acpi.c 4 additions, 4 deletionsarch/ia64/kernel/acpi.c
- arch/ia64/kernel/machine_kexec.c 1 addition, 1 deletionarch/ia64/kernel/machine_kexec.c
- arch/ia64/kernel/mca.c 2 additions, 0 deletionsarch/ia64/kernel/mca.c
- arch/ia64/sn/kernel/huberror.c 2 additions, 0 deletionsarch/ia64/sn/kernel/huberror.c
- arch/ia64/sn/kernel/io_common.c 1 addition, 0 deletionsarch/ia64/sn/kernel/io_common.c
- arch/ia64/sn/kernel/irq.c 2 additions, 0 deletionsarch/ia64/sn/kernel/irq.c
- arch/ia64/sn/kernel/sn2/sn_hwperf.c 1 addition, 0 deletionsarch/ia64/sn/kernel/sn2/sn_hwperf.c
- arch/ia64/sn/kernel/tiocx.c 6 additions, 1 deletionarch/ia64/sn/kernel/tiocx.c
- arch/ia64/sn/pci/pcibr/pcibr_provider.c 1 addition, 0 deletionsarch/ia64/sn/pci/pcibr/pcibr_provider.c
- arch/ia64/sn/pci/tioca_provider.c 1 addition, 0 deletionsarch/ia64/sn/pci/tioca_provider.c
- arch/ia64/sn/pci/tioce_provider.c 1 addition, 0 deletionsarch/ia64/sn/pci/tioce_provider.c
- drivers/tty/serial/sn_console.c 1 addition, 0 deletionsdrivers/tty/serial/sn_console.c
Loading
Please register or sign in to comment