commit | 34750bb15687fa03ba95a0ccb1307b0727bc308b | [log] [tgz] |
---|---|---|
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | Thu Jun 07 17:09:01 2007 -0700 |
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | Thu Jun 07 17:09:01 2007 -0700 |
tree | 84e4b9987fb2dce76978ce585c6649625a3f2cf0 | |
parent | df3872a9664667edae729361c9948b652de5c6f4 [diff] | |
parent | ec4d18f219e71ef682fe2d7b9a6d121617fef6d5 [diff] |
Merge branch 'master' of master.kernel.org:/pub/scm/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.