From: Linus Torvalds <torvalds@woody.osdl.org>
Date: Sat, 9 Dec 2006 21:31:07 +0000 (-0800)
Subject: Merge branch 'for-linus' of git://one.firstfloor.org/home/andi/git/linux-2.6
X-Git-Tag: v2.6.20-rc1~34^2~19
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=af1713e0f111647052953ba12fd10a59c74a5dde;p=linux-2.6

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
---

af1713e0f111647052953ba12fd10a59c74a5dde