• Linus Torvalds's avatar
    Merge branch 'irq-cleanup-for-linus' of... · 0dd61be7
    Linus Torvalds authored
    Merge branch 'irq-cleanup-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
    
    * 'irq-cleanup-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (23 commits)
      genirq: Expand generic show_interrupts()
      gpio: Fold irq_set_chip/irq_set_handler to irq_set_chip_and_handler
      gpio: Cleanup genirq namespace
      arm: ep93xx: Add basic interrupt info
      arm/gpio: Remove three copies of broken and racy debug code
      xtensa: Use generic show_interrupts()
      xtensa: Convert genirq namespace
      xtensa: Use generic IRQ Kconfig and set GENERIC_HARDIRQS_NO_DEPRECATED
      xtensa: Convert s6000 gpio irq_chip to new functions
      xtensa: Convert main irq_chip to new functions
      um: Use generic show_interrupts()
      um: Convert genirq namespace
      m32r: Use generic show_interrupts()
      m32r: Convert genirq namespace
      h8300: Use generic show_interrupts()
      h8300: Convert genirq namespace
      avr32: Cleanup eic_set_irq_type()
      avr32: Use generic show_interrupts()
      avr: Cleanup genirq namespace
      avr32: Use generic IRQ config, enable GENERIC_HARDIRQS_NO_DEPRECATED
      ...
    
    Fix up trivial conflict in drivers/gpio/timbgpio.c
    0dd61be7
timbgpio.c 8.99 KB