From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Mon, 2 Apr 2007 18:41:55 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://one.firstfloor.org/home/andi/git/linux-2.6
X-Git-Tag: v2.6.21-rc6~23
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9a5ee4cc9ef8de5185114237a81f5f395e21d8fd;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: Don't probe for DDC on VBE1.2
  [PATCH] x86-64: Increase NMI watchdog probing timeout
  [PATCH] x86-64: Let oprofile reserve MSR on all CPUs
  [PATCH] x86-64: Disable local APIC timer use on AMD systems with C1E
---

9a5ee4cc9ef8de5185114237a81f5f395e21d8fd