From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Fri, 28 Oct 2005 22:57:32 +0000 (-0700)
Subject: Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6
X-Git-Tag: v2.6.15-rc1~731^2~22
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7efe5d7c3e3a82e43b0f8fb29c6797317bce7a9a;p=linux-2.6

Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6
---

7efe5d7c3e3a82e43b0f8fb29c6797317bce7a9a