From: Christoph Lameter <clameter@sgi.com>
Date: Tue, 12 Feb 2008 20:19:16 +0000 (-0800)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
X-Git-Url: http://git.mmlx.us/?a=commitdiff_plain;h=9e40ade04c45a46f6b3d647e0bdac1a32bfaa3a9;p=linux-edison.git

Merge branch 'master' of git://git./linux/kernel/git/torvalds/linux-2.6
---

9e40ade04c45a46f6b3d647e0bdac1a32bfaa3a9