| commit | 256a13dd708004082a2de0938fd614b155c259e2 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Fri Jun 06 11:33:08 2008 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Fri Jun 06 11:33:08 2008 -0700 |
| tree | 5e917c649b9ea7792a18cdf8a25736bc62b870e9 | |
| parent | 330bcd2f7bd1e2e66d54bf95adca0795b262469f [diff] | |
| parent | 9f67fd5db50566728996b0115a08c83d4f902cb3 [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: add workaround for bug in ASUS A7V600 BIOS (rev 1005) PCI/x86: fix up PCI stuff so that PCI_GOANY supports OLPC