Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Fri, 8 Jun 2007 00:09:01 +0000 (17:09 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Fri, 8 Jun 2007 00:09:01 +0000 (17:09 -0700)
* '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.


Trivial merge