Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
* 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6: [SPARC64]: Mark most of initial bootup asm as .text.init.ref_ok [SPARC32]: Fix bug in sparc optimized memset. [SPARC64]: Update defconfig. [SPARC]: Add missing NOTES section. [SPARC32]: missing exports [SPARC32]: Deal with rtc/sun_mostek_rtc conflict.
Showing
- arch/sparc/defconfig 1 addition, 1 deletionarch/sparc/defconfig
- arch/sparc/kernel/sparc_ksyms.c 3 additions, 0 deletionsarch/sparc/kernel/sparc_ksyms.c
- arch/sparc/kernel/vmlinux.lds.S 2 additions, 0 deletionsarch/sparc/kernel/vmlinux.lds.S
- arch/sparc/lib/memset.S 1 addition, 1 deletionarch/sparc/lib/memset.S
- arch/sparc/prom/printf.c 2 additions, 0 deletionsarch/sparc/prom/printf.c
- arch/sparc64/defconfig 11 additions, 21 deletionsarch/sparc64/defconfig
- arch/sparc64/kernel/head.S 7 additions, 4 deletionsarch/sparc64/kernel/head.S
- arch/sparc64/kernel/vmlinux.lds.S 2 additions, 0 deletionsarch/sparc64/kernel/vmlinux.lds.S
- drivers/char/Kconfig 23 additions, 1 deletiondrivers/char/Kconfig
- drivers/char/Makefile 3 additions, 0 deletionsdrivers/char/Makefile
- drivers/sbus/char/Kconfig 1 addition, 0 deletionsdrivers/sbus/char/Kconfig
Loading
Please register or sign in to comment