tree 75233676c8145a4974dee0ec71a9bba2df33a704
parent 89499759dc0dd300528510f465b0bf532fc79a2a
parent a83fe32fa668c0a17b3f99a1480b006f7d649924
author Jesse Barnes <jbarnes@virtuousgeek.org> 1219078453 -0700
committer Jesse Barnes <jbarnes@virtuousgeek.org> 1219078453 -0700

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