• Linus Torvalds's avatar
    Merge tag 'ia64-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux · 0e65ae09
    Linus Torvalds authored
    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()
    0e65ae09
sn_console.c 29.5 KB