Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
authorChristoph Lameter <clameter@sgi.com>
Tue, 12 Feb 2008 20:19:16 +0000 (12:19 -0800)
committerChristoph Lameter <clameter@sgi.com>
Tue, 12 Feb 2008 20:19:16 +0000 (12:19 -0800)

Trivial merge