Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
authorChristoph Lameter <clameter@sgi.com>
Mon, 3 Mar 2008 19:18:08 +0000 (11:18 -0800)
committerChristoph Lameter <clameter@sgi.com>
Mon, 3 Mar 2008 19:18:08 +0000 (11:18 -0800)

Trivial merge