From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 30 Oct 2008 19:09:44 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes... 
X-Git-Url: http://git.mmlx.us/?a=commitdiff_plain;h=d6c3112abe44d7f718bd5aec8ab9469fecff6041;p=linux-edison.git

Merge branch 'for-linus' of git://git./linux/kernel/git/jbarnes/pci-2.6

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6:
  x86/PCI: build failure at x86/kernel/pci-dma.c with !CONFIG_PCI
---

d6c3112abe44d7f718bd5aec8ab9469fecff6041