Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6

Browse source

* 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6:
  [SPARC64]: Fix SBUS IRQ regression caused by PCI-E driver.
  [SPARC64]: Fix 2 bugs in PCI Sabre bus scanning.

...

This commit is contained in:

Linus Torvalds 2007-06-07 17:09:01 -07:00

parent df3872a966 ec4d18f219

commit 34750bb156

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

17

arch/sparc64/kernel/pci_sabre.c

View file

54

arch/sparc64/kernel/prom.c

View file

54

arch/sparc64/kernel/sbus.c

View file