Merge branch 'irq-cleanup-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

* '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

diff --cc arch/h8300/Kconfig
Simple merge

diff --cc arch/m32r/Kconfig
Simple merge

diff --cc arch/xtensa/Kconfig
Simple merge

diff --cc drivers/gpio/timbgpio.c
index ffcd815b8b8b32a71dbae3b3e4320262d6d1ccaa,0265872e57d15e666b1365b2954befb9e98bf59b..edbe1eae531fa6ad35394232af3de40f78425622
--- 1/drivers/gpio/timbgpio.c
--- 2/drivers/gpio/timbgpio.c
+++ b/drivers/gpio/timbgpio.c
@@@ -326,13 -326,13 +326,13 @@@ static int __devexit timbgpio_remove(st
  
        if (irq >= 0 && tgpio->irq_base > 0) {
                int i;
 -              for (i = 0; i < pdata->nr_pins; i++) {
 +              for (i = 0; i < tgpio->gpio.ngpio; i++) {
-                       set_irq_chip(tgpio->irq_base + i, NULL);
-                       set_irq_chip_data(tgpio->irq_base + i, NULL);
+                       irq_set_chip(tgpio->irq_base + i, NULL);
+                       irq_set_chip_data(tgpio->irq_base + i, NULL);
                }
  
-               set_irq_handler(irq, NULL);
-               set_irq_data(irq, NULL);
+               irq_set_handler(irq, NULL);
+               irq_set_handler_data(irq, NULL);
        }
  
        err = gpiochip_remove(&tgpio->gpio);