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

This merges branches irq/genirq, irq/sparseirq-v4, timers/hpet-percpu
and x86/uv.

The sparseirq branch is just preliminary groundwork: no sparse IRQs are
actually implemented by this tree anymore - just the new APIs are added
while keeping the old way intact as well (the new APIs map 1:1 to
irq_desc[]).  The 'real' sparse IRQ support will then be a relatively
small patch ontop of this - with a v2.6.29 merge target.

* 'genirq-v28-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (178 commits)
  genirq: improve include files
  intr_remapping: fix typo
  io_apic: make irq_mis_count available on 64-bit too
  genirq: fix name space collisions of nr_irqs in arch/*
  genirq: fix name space collision of nr_irqs in autoprobe.c
  genirq: use iterators for irq_desc loops
  proc: fixup irq iterator
  genirq: add reverse iterator for irq_desc
  x86: move ack_bad_irq() to irq.c
  x86: unify show_interrupts() and proc helpers
  x86: cleanup show_interrupts
  genirq: cleanup the sparseirq modifications
  genirq: remove artifacts from sparseirq removal
  genirq: revert dynarray
  genirq: remove irq_to_desc_alloc
  genirq: remove sparse irq code
  genirq: use inline function for irq_to_desc
  genirq: consolidate nr_irqs and for_each_irq_desc()
  x86: remove sparse irq from Kconfig
  genirq: define nr_irqs for architectures with GENERIC_HARDIRQS=n
  ...

diff --cc arch/arm/mach-omap2/irq.c
Simple merge

diff --cc arch/x86/Kconfig
Simple merge

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

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

diff --cc drivers/char/random.c
Simple merge

diff --cc drivers/gpio/gpiolib.c
Simple merge

diff --cc drivers/mfd/htc-egpio.c
Simple merge

diff --cc drivers/pci/dmar.c
Simple merge

diff --cc drivers/pci/intr_remapping.c
Simple merge

diff --cc drivers/serial/8250.c
Simple merge

diff --cc drivers/serial/cpm_uart/cpm_uart_core.c
Simple merge

diff --cc drivers/serial/sh-sci.c
Simple merge

diff --cc drivers/serial/ucc_uart.c
Simple merge

diff --cc fs/proc/proc_misc.c
Simple merge

diff --cc include/asm-x86/es7000/apic.h
Simple merge

diff --cc include/asm-x86/summit/apic.h
Simple merge

diff --cc include/linux/interrupt.h
Simple merge

diff --cc include/linux/kernel_stat.h
Simple merge

diff --cc include/linux/pci.h
Simple merge