From: Jesse Barnes <jbarnes@virtuousgeek.org>
Date: Mon, 18 Aug 2008 16:54:13 +0000 (-0700)
Subject: Merge branch 'pci-for-jesse' of git://git.kernel.org/pub/scm/linux/kernel/git/tip... 
X-Git-Tag: v2.6.27-rc4~36^2^2
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=ce6754235b423610e91f5300e1555c2e4ee1c03a;p=linux-2.6-omap-h63xx.git

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
---

ce6754235b423610e91f5300e1555c2e4ee1c03a