From: Linus Torvalds <torvalds@woody.osdl.org>
Date: Tue, 21 Nov 2006 16:07:38 +0000 (-0800)
Subject: Merge branch 'for-linus' of git://one.firstfloor.org/home/andi/git/linux-2.6
X-Git-Tag: v2.6.19~58
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=b80ebbf39fc628afab7d9cf94b84cfc51d845b2f;p=~shefty%2Frdma-dev.git

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
---

b80ebbf39fc628afab7d9cf94b84cfc51d845b2f