From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Thu, 8 Sep 2005 22:55:23 +0000 (-0700)
Subject: Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6
X-Git-Tag: tegra-9.12.3~26486^2~21
X-Git-Url: https://nv-tegra.nvidia.com/r/gitweb?p=linux-2.6.git;a=commitdiff_plain;h=7bbedd521310547ca73cc77adcf61fb85723adc3;hp=-c

Merge /pub/scm/linux/kernel/git/gregkh/pci-2.6
---

7bbedd521310547ca73cc77adcf61fb85723adc3