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
Showing
- arch/sparc/kernel/ioport.c 5 additions, 0 deletionsarch/sparc/kernel/ioport.c
- arch/sparc/kernel/module.c 1 addition, 0 deletionsarch/sparc/kernel/module.c
- arch/sparc/kernel/sparc_ksyms.c 0 additions, 13 deletionsarch/sparc/kernel/sparc_ksyms.c
- arch/sparc64/defconfig 13 additions, 6 deletionsarch/sparc64/defconfig
- arch/sparc64/kernel/module.c 5 additions, 0 deletionsarch/sparc64/kernel/module.c
- drivers/sbus/char/openprom.c 9 additions, 6 deletionsdrivers/sbus/char/openprom.c
- lib/Kconfig.debug 1 addition, 1 deletionlib/Kconfig.debug
Loading
Please register or sign in to comment