From: Linus Torvalds <torvalds@ppc970.osdl.org>
Date: Tue, 28 Jun 2005 21:59:07 +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=adb2705a89e8b41abcf29c0ed86f4ce93ab36734;p=linux-edison.git

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

adb2705a89e8b41abcf29c0ed86f4ce93ab36734