From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Tue, 5 Jul 2005 18:35:58 +0000 (-0700)
Subject: Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6
X-Git-Url: http://git.mmlx.us/?a=commitdiff_plain;h=346fced899c7390e555cf90cd07d1e56b460d21b;p=linux-edison.git

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

346fced899c7390e555cf90cd07d1e56b460d21b