]> nv-tegra.nvidia Code Review - linux-2.6.git/commitdiff
Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/x86
authorLinus Torvalds <torvalds@g5.osdl.org>
Wed, 1 Feb 2006 00:21:44 +0000 (16:21 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Wed, 1 Feb 2006 00:21:44 +0000 (16:21 -0800)

Trivial merge