Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
authorLinus Torvalds <torvalds@g5.osdl.org>
Fri, 12 May 2006 22:26:29 +0000 (15:26 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Fri, 12 May 2006 22:26:29 +0000 (15:26 -0700)
commitfaa88df860fdfad13afc99fc7201432f9263b3b5
tree0c5b480922c4a2d65154f610ae04928790de96da
parent1b52fa98edd1c3e663ea4a06519e3d20976084a8
parent586152560ae8df2a9babf1a8b667d7a145cb8208
Merge /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