@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
§Í®[”