Merge git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-cpumask

* git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-cpumask:
  oprofile: Thou shalt not call __exit functions from __init functions
  cpumask: remove the now-obsoleted pcibus_to_cpumask(): generic
  cpumask: remove cpumask_t from core
  cpumask: convert rcutorture.c
  cpumask: use new cpumask_ functions in core code.
  cpumask: remove references to struct irqaction's mask field.
  cpumask: use mm_cpumask() wrapper: kernel/fork.c
  cpumask: use set_cpu_active in init/main.c
  cpumask: remove node_to_first_cpu
  cpumask: fix seq_bitmap_*() functions.
  cpumask: remove dangerous CPU_MASK_ALL_PTR, &CPU_MASK_ALL

diff --cc arch/mips/emma/markeins/irq.c
Simple merge

diff --cc arch/mips/sgi-ip27/ip27-nmi.c
Simple merge

diff --cc arch/mips/sgi-ip32/ip32-irq.c
Simple merge

diff --cc arch/mips/sni/rm200.c
Simple merge

diff --cc arch/powerpc/platforms/85xx/mpc85xx_cds.c
Simple merge

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

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

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