From: Linus Torvalds 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-Tag: v2.6.21~1 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2fb90b128aaf7758e3de22119515fb11174d4f23;p=thirdparty%2Fkernel%2Flinux.git 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 --- 2fb90b128aaf7758e3de22119515fb11174d4f23