Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
authorAndi Kleen <andi@basil.nowhere.org>
Tue, 21 Nov 2006 09:22:09 +0000 (10:22 +0100)
committerAndi Kleen <andi@basil.nowhere.org>
Tue, 21 Nov 2006 09:22:09 +0000 (10:22 +0100)

Trivial merge