Merge branch 'for-linus' of git://one.firstfloor.org/home/andi/git/linux-2.6
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Mon, 2 Apr 2007 18:41:55 +0000 (11:41 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Mon, 2 Apr 2007 18:41:55 +0000 (11:41 -0700)
commit9a5ee4cc9ef8de5185114237a81f5f395e21d8fd
tree378d367ba1d97304051d3be0cec901fe8ab38d60
parentb6a8b316c667f914c198a2de62e6729f359b7931
parenta369a7100da3b4f5c2269be25160653d2c7013fc
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