Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 30 Oct 2008 19:09:44 +0000 (12:09 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 30 Oct 2008 19:09:44 +0000 (12:09 -0700)
commitd6c3112abe44d7f718bd5aec8ab9469fecff6041
tree362e826e1e39e6108301893ba35100c8719028b6
parentfce4877a6792ad72b88f6fd7556d19da5f20364d
parent3b15e581981b3ad35809f56d8131d5c19b6da1bd
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