]> err.no Git - linux-2.6/commit
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Wed, 25 Apr 2007 20:51:45 +0000 (13:51 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Wed, 25 Apr 2007 20:51:45 +0000 (13:51 -0700)
commit2fb90b128aaf7758e3de22119515fb11174d4f23
tree082a1b9eaa0c17ca6ccae3aef03f58a77d60dc69
parent707abb7986293b24b83dba163ffc79d8895236f9
parent5a68b2e346f043820e2ba0cde57cc75b4561c124
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