diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2011-03-12 12:22:22 (GMT) |
---|---|---|
committer | Thomas Gleixner <tglx@linutronix.de> | 2011-03-12 12:22:28 (GMT) |
commit | cfe08bba1e0017d94a8f738a195d3a2b479327e3 (patch) | |
tree | 4546939fd9fbddc978b6eaa0299b03177e9e643b /kernel/irq/irqdesc.c | |
parent | 58bff947e2d164c7e5cbf7f485e4b3d4884befeb (diff) | |
parent | abb0052289e58140d933b29491f59e4be0a19727 (diff) | |
download | linux-cfe08bba1e0017d94a8f738a195d3a2b479327e3.tar.xz |
Merge branch 'x86/apic' into x86/irq
Reason: Update to latest genirq code conflicts with pending apic
changes
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'kernel/irq/irqdesc.c')
0 files changed, 0 insertions, 0 deletions