]> nv-tegra.nvidia Code Review - linux-3.10.git/commitdiff
Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6
authorLinus Torvalds <torvalds@ppc970.osdl.org>
Tue, 28 Jun 2005 21:59:07 +0000 (14:59 -0700)
committerLinus Torvalds <torvalds@ppc970.osdl.org>
Tue, 28 Jun 2005 21:59:07 +0000 (14:59 -0700)

Trivial merge