| commit | d6c3112abe44d7f718bd5aec8ab9469fecff6041 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Thu Oct 30 12:09:44 2008 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Thu Oct 30 12:09:44 2008 -0700 |
| tree | 362e826e1e39e6108301893ba35100c8719028b6 | |
| parent | fce4877a6792ad72b88f6fd7556d19da5f20364d [diff] | |
| parent | 3b15e581981b3ad35809f56d8131d5c19b6da1bd [diff] |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/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