tree 4a0cc831c88f888e33a6d9c5ff89f80a8aee42a0
parent 9b3a89f8b052f2a6193a9691e053f986144a65a0
parent f0f32fccbffaaba8596d5c671153aa37aea9d4f0
author Linus Torvalds <torvalds@woody.osdl.org> 1165699867 -0800
committer Linus Torvalds <torvalds@woody.osdl.org> 1165699867 -0800

Merge branch 'for-linus' of git://one.firstfloor.org/home/andi/git/linux-2.6

* 'for-linus' of git://one.firstfloor.org/home/andi/git/linux-2.6:
  [PATCH] x86-64: no paravirt for X86_VOYAGER or X86_VISWS
  [PATCH] i386: Fix io_apic.c warning
  [PATCH] i386: export smp_num_siblings for oprofile
  [PATCH] x86: Work around gcc 4.2 over aggressive optimizer
  [PATCH] x86: Fix boot hang due to nmi watchdog init code
  [PATCH] x86: Fix verify_quirk_intel_irqbalance()
  [PATCH] i386: Update defconfig
  [PATCH] x86-64: Update defconfig