From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Wed, 25 Apr 2007 20:51:45 +0000 (-0700)
Subject: Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=2fb90b128aaf7758e3de22119515fb11174d4f23;p=GitHub%2FLineageOS%2Fandroid_kernel_samsung_universal7580.git

Merge /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
---

2fb90b128aaf7758e3de22119515fb11174d4f23