diff options
| author | Jiri Kosina | 2010-03-08 16:55:37 +0100 |
|---|---|---|
| committer | Jiri Kosina | 2010-03-08 16:55:37 +0100 |
| commit | 318ae2edc3b29216abd8a2510f3f80b764f06858 (patch) | |
| tree | ce595adde342f57f379d277b25e4dd206988a052 /arch/arm/boot | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/amit/virtio-console (diff) | |
| parent | doc: fix typo in comment explaining rb_tree usage (diff) | |
| download | kernel-qcow2-linux-318ae2edc3b29216abd8a2510f3f80b764f06858.tar.gz kernel-qcow2-linux-318ae2edc3b29216abd8a2510f3f80b764f06858.tar.xz kernel-qcow2-linux-318ae2edc3b29216abd8a2510f3f80b764f06858.zip | |
Merge branch 'for-next' into for-linus
Conflicts:
Documentation/filesystems/proc.txt
arch/arm/mach-u300/include/mach/debug-macro.S
drivers/net/qlge/qlge_ethtool.c
drivers/net/qlge/qlge_main.c
drivers/net/typhoon.c
Diffstat (limited to 'arch/arm/boot')
| -rw-r--r-- | arch/arm/boot/bootp/init.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/boot/bootp/init.S b/arch/arm/boot/bootp/init.S index df7bc7068d0f..8b0de41c3dcb 100644 --- a/arch/arm/boot/bootp/init.S +++ b/arch/arm/boot/bootp/init.S @@ -49,7 +49,7 @@ _start: add lr, pc, #-0x8 @ lr = current load addr /* * find the end of the tag list, and then add an INITRD tag on the end. * If there is already an INITRD tag, then we ignore it; the last INITRD - * tag takes precidence. + * tag takes precedence. */ taglist: ldr r10, [r9, #0] @ tag length teq r10, #0 @ last tag (zero length)? |