drivers/pci/probe.c · a59f2bbaedc5de5a69db5d9c914462173ef3ffa6 · Kirill Smelkov / linux

Jesse Barnes authored Aug 18, 2008

Merge branch 'pci-for-jesse' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip into x86-merge

Conflicts:

	drivers/pci/probe.c

ce675423

probe.c 33.6 KB