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)
commit34750bb15687fa03ba95a0ccb1307b0727bc308b
tree84e4b9987fb2dce76978ce585c6649625a3f2cf0
parentdf3872a9664667edae729361c9948b652de5c6f4
parentec4d18f219e71ef682fe2d7b9a6d121617fef6d5
Merge branch 'master' of /linux/kernel/git/davem/sparc-2.6

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