Merge branch 'for-linus' of git://one.firstfloor.org/home/andi/git/linux-2.6
authorLinus Torvalds <torvalds@woody.osdl.org>
Tue, 21 Nov 2006 16:07:38 +0000 (08:07 -0800)
committerLinus Torvalds <torvalds@woody.osdl.org>
Tue, 21 Nov 2006 16:07:38 +0000 (08:07 -0800)
* '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


Trivial merge