Merge branches 'irq/sparseirq', 'irq/genirq' and 'irq/urgent'; commit 'v2.6.28' into...
Ingo Molnar [Thu, 25 Dec 2008 15:27:54 +0000 (16:27 +0100)]
1  2  3  4 
arch/x86/kernel/setup.c
include/linux/irq.h
kernel/irq/chip.c

Simple merge
@@@@@ -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
Simple merge