]> pilppa.com Git - linux-2.6-omap-h63xx.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)
commitce6754235b423610e91f5300e1555c2e4ee1c03a
tree75233676c8145a4974dee0ec71a9bba2df33a704
parent89499759dc0dd300528510f465b0bf532fc79a2a
parenta83fe32fa668c0a17b3f99a1480b006f7d649924
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