| commit | 2fb90b128aaf7758e3de22119515fb11174d4f23 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | Wed Apr 25 13:51:45 2007 -0700 |
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | Wed Apr 25 13:51:45 2007 -0700 |
| tree | 082a1b9eaa0c17ca6ccae3aef03f58a77d60dc69 | |
| parent | 707abb7986293b24b83dba163ffc79d8895236f9 [diff] | |
| parent | 5a68b2e346f043820e2ba0cde57cc75b4561c124 [diff] |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6 * master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6: [PARPORT] SUNBPP: Fix OOPS when debugging is enabled. [SPARC] openprom: Switch to ref counting PCI API