Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
commit0ab598099c18affd73a21482274c00e8119236be
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Thu, 10 May 2007 20:32:05 +0000 (10 13:32 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Thu, 10 May 2007 20:32:05 +0000 (10 13:32 -0700)
tree599ddc4ffb8bfa4bb6364eb4f4a3e91bfd9cb6c9
parentb526ca438b95a6d71210e0ffc79aabac8aba2b1e
parent26e6385f14b991e30450daee4348cbbc4bc4bb09
Merge /pub/scm/linux/kernel/git/davem/sparc-2.6

* master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6:
  [SPARC64]: Use alloc_pci_dev() in PCI bus probes.
  [SPARC64]: Bump PROMINTR_MAX to 32.
  [SPARC64]: Fix recursion in PROM tree building.
  [SERIAL] sunzilog: Interrupt enable before ISR handler installed
  [SPARC64] PCI: Consolidate PCI access code into pci_common.c