Commit b24b10d7 authored by Linus Torvalds's avatar Linus Torvalds

Merge bk://kernel.bkbits.net/davem/sparc-2.6

into ppc970.osdl.org:/home/torvalds/v2.6/linux
parents 0ac3fc9f 5a9f7c9f
...@@ -50,7 +50,6 @@ bootup_user_stack: ...@@ -50,7 +50,6 @@ bootup_user_stack:
*/ */
.global root_flags, ram_flags, root_dev .global root_flags, ram_flags, root_dev
.global sparc_ramdisk_image, sparc_ramdisk_size .global sparc_ramdisk_image, sparc_ramdisk_size
.globl silo_args
.ascii "HdrS" .ascii "HdrS"
.word LINUX_VERSION_CODE .word LINUX_VERSION_CODE
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment