tree 106df5279ca8cb5b978bd4b9b35cfea02fe7ab86
parent e5ffd2bb62c3f2c0d9f34e0d16fab6e2c8b056fb
parent 3af9815328bba76e8d11d71d6dbbd6f38beafe58
author Linus Torvalds <torvalds@woody.osdl.org> 1164125258 -0800
committer Linus Torvalds <torvalds@woody.osdl.org> 1164125258 -0800

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: Align data segment to PAGE_SIZE boundary
  [PATCH] x86-64: increase PHB1 split transaction timeout
  [PATCH] x86-64: Fix C3 timer test