]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'pci-for-jesse' of git://git.kernel.org/pub/scm/linux/kernel/git/tip...
authorJesse Barnes <jbarnes@virtuousgeek.org>
Mon, 18 Aug 2008 16:54:13 +0000 (09:54 -0700)
committerJesse Barnes <jbarnes@virtuousgeek.org>
Mon, 18 Aug 2008 16:54:13 +0000 (09:54 -0700)
commit70540613423ddae2b70fbad53621d5205d6edd19
tree75233676c8145a4974dee0ec71a9bba2df33a704
parente384cb1e7a8d4bba7741f2a806d35222b0d6f2f6
parent52aadd93bda5c57250e6a0c1cd42b123556b9d07
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
drivers/pci/probe.c