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]: Re-export saved_command_line to modules. [SPARC64]: Increase command line size to 2048 like other arches. [SPARC64]: We do not need ZONE_DMA.
Showing
- arch/sparc/kernel/sparc_ksyms.c 1 addition, 1 deletionarch/sparc/kernel/sparc_ksyms.c
- arch/sparc64/Kconfig 0 additions, 8 deletionsarch/sparc64/Kconfig
- arch/sparc64/defconfig 8 additions, 5 deletionsarch/sparc64/defconfig
- arch/sparc64/kernel/sparc64_ksyms.c 1 addition, 1 deletionarch/sparc64/kernel/sparc64_ksyms.c
- arch/sparc64/mm/init.c 2 additions, 2 deletionsarch/sparc64/mm/init.c
- include/asm-sparc64/setup.h 1 addition, 1 deletioninclude/asm-sparc64/setup.h
Loading
Please register or sign in to comment