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

Browse source

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

...

This commit is contained in:

Linus Torvalds 2008-06-06 11:33:08 -07:00

parent 330bcd2f7b 9f67fd5db5

commit 256a13dd70

5 changed files with 18 additions and 10 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

11

arch/x86/Kconfig

View file

3

arch/x86/pci/init.c

View file

7

arch/x86/pci/irq.c

View file

5

arch/x86/pci/olpc.c

View file

2

arch/x86/pci/pci.h

View file