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: remove IOH range fetching
  PCI: fix nested spinlock hang in aer_inject

...

This commit is contained in:

Linus Torvalds 2010-01-28 16:33:12 -08:00

parent 474118d06d e8e06eae4f

commit 3d29935ff0

3 changed files with 7 additions and 101 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

2

arch/x86/pci/Makefile

View file

94

arch/x86/pci/intel_bus.c

View file

12

drivers/pci/pcie/aer/aer_inject.c

View file