Merge branch 'for-linus' of git://one.firstfloor.org/home/andi/git/linux-2.6
authorLinus Torvalds <torvalds@g5.osdl.org>
Sat, 21 Oct 2006 23:52:40 +0000 (16:52 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Sat, 21 Oct 2006 23:52:40 +0000 (16:52 -0700)
commit5cfc35cf79d46af998346e3d5cc66fa344d1af0e
treebdaa46ddd39243df9bf74d02a2046ebb8901c720
parentf8829caee311207afbc882794bdc5aa0db5caf33
parentcb01fc720c629261b9c616b2d5fcc3d93cd8bb09
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: increase PHB1 split transaction timeout
  [PATCH] x86-64: Fix C3 timer test