tree bdaa46ddd39243df9bf74d02a2046ebb8901c720
parent f8829caee311207afbc882794bdc5aa0db5caf33
parent cb01fc720c629261b9c616b2d5fcc3d93cd8bb09
author Linus Torvalds <torvalds@g5.osdl.org> 1161474760 -0700
committer Linus Torvalds <torvalds@g5.osdl.org> 1161474760 -0700

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