Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
authorAndi Kleen <andi@basil.nowhere.org>
Tue, 28 Nov 2006 19:12:29 +0000 (20:12 +0100)
committerAndi Kleen <andi@basil.nowhere.org>
Tue, 28 Nov 2006 19:12:29 +0000 (20:12 +0100)
commita3550a9c543556cf7764be81aeb17c6dab440753
treee8c8bf721cc917c8842c4a007ad4b3f68eb7aa1e
parent9a14f2964b459c18198ee59ff7212321def82df7
parent2ea5814472c3c910aed5c5b60f1f3b1000e353f1
Merge branch 'master' of git://git./linux/kernel/git/torvalds/linux-2.6