git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commitdiff

]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commitdiff

author	Linus Torvalds <torvalds@linux-foundation.org>
	Thu, 30 Oct 2008 19:09:44 +0000 (12:09 -0700)
committer	Linus Torvalds <torvalds@linux-foundation.org>
	Thu, 30 Oct 2008 19:09:44 +0000 (12:09 -0700)

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

Trivial merge

Ubuntu Eoan Linux kernel mirror