| commit | faa88df860fdfad13afc99fc7201432f9263b3b5 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@g5.osdl.org> | Fri May 12 15:26:29 2006 -0700 |
| committer | Linus Torvalds <torvalds@g5.osdl.org> | Fri May 12 15:26:29 2006 -0700 |
| tree | 0c5b480922c4a2d65154f610ae04928790de96da | |
| parent | 1b52fa98edd1c3e663ea4a06519e3d20976084a8 [diff] | |
| parent | 586152560ae8df2a9babf1a8b667d7a145cb8208 [diff] |
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