tree 082a1b9eaa0c17ca6ccae3aef03f58a77d60dc69
parent 707abb7986293b24b83dba163ffc79d8895236f9
parent 5a68b2e346f043820e2ba0cde57cc75b4561c124
author Linus Torvalds <torvalds@woody.linux-foundation.org> 1177534305 -0700
committer Linus Torvalds <torvalds@woody.linux-foundation.org> 1177534305 -0700

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