From: Linus Torvalds Date: Fri, 12 May 2006 22:26:29 +0000 (-0700) Subject: Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6 X-Git-Tag: v2.6.17-rc5~161 X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=faa88df860fdfad13afc99fc7201432f9263b3b5;p=~emulex%2Finfiniband.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: [SPARC]: Fix warning on prom_getproperty in openprom.c [SPARC]: Handle UNWIND_INFO properly. [SPARC64]: Update defconfig. [SPARC]: show device name in /proc/dvma_map [SPARC]: Remove duplicate symbol exports --- faa88df860fdfad13afc99fc7201432f9263b3b5