Merge branches 'irq/sparseirq', 'irq/genirq' and 'irq/urgent'; commit 'v2.6.28' into...

diff --cc arch/x86/kernel/setup.c
Simple merge

diff --cc include/linux/irq.h
index 838a977885e19cd3f81f1cdcac604a082b2bd21e,7fa7f30fccb6cc72d06cb878999297d12a0ac4df,3dddfa703ebd95ab1253c56397104c2607f98e90,3dddfa703ebd95ab1253c56397104c2607f98e90..98564dc6447627f0d6c25033e3ba601db819daf1
--- 1/include/linux/irq.h
--- 2/include/linux/irq.h
--- 3/include/linux/irq.h
--- 4/include/linux/irq.h
+++ b/include/linux/irq.h
@@@@@ -128,9 -129,14 -129,9 -129,9 +129,14 @@@@@ struct irq_chip 
        const char      *typename;
    };
    
+ ++struct timer_rand_state;
+ ++struct irq_2_iommu;
    /**
     * struct irq_desc - interrupt descriptor
-    *
+    * @irq:            interrupt number for this descriptor
+ ++ * @timer_rand_state:       pointer to timer rand state struct
+ ++ * @kstat_irqs:             irq stats per cpu
+ ++ * @irq_2_iommu:    iommu with this irq
     * @handle_irq:             highlevel irq-events handler [if NULL, __do_IRQ()]
     * @chip:           low level interrupt hardware access
     * @msi_desc:               MSI descriptor

diff --cc kernel/irq/chip.c
Simple merge