diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-03 16:35:11 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-03 16:35:11 -0700 |
| commit | 708e16892e1646594a29eaa7ac7b209b600b9fd2 (patch) | |
| tree | fe7c31bc0edef84eb1075c7e195340047d6aaa17 /arch/um | |
| parent | f3c87a8999c28f2948ebd407574f7e9fb5c577b2 (diff) | |
| parent | a847825970e741e20a09c659978baa34016b63bc (diff) | |
| download | kernel_samsung_tuna-708e16892e1646594a29eaa7ac7b209b600b9fd2.zip kernel_samsung_tuna-708e16892e1646594a29eaa7ac7b209b600b9fd2.tar.gz kernel_samsung_tuna-708e16892e1646594a29eaa7ac7b209b600b9fd2.tar.bz2 | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial
* git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial: (39 commits)
Add missing maintainer countries in CREDITS
Fix bytes <-> kilobytes typo in Kconfig for ramdisk
fix a typo in Documentation/pi-futex.txt
BUG_ON conversion for fs/xfs/
BUG_ON() conversion in fs/nfsd/
BUG_ON conversion for fs/reiserfs
BUG_ON cleanups in arch/i386
BUG_ON cleanup in drivers/net/tokenring/
BUG_ON cleanup for drivers/md/
kerneldoc-typo in led-class.c
debugfs: spelling fix
rcutorture: Fix incorrect description of default for nreaders parameter
parport: Remove space in function calls
Michal Wronski: update contact info
Spelling fix: "control" instead of "cotrol"
reboot parameter in Documentation/kernel-parameters.txt
Fix copy&waste bug in comment in scripts/kernel-doc
remove duplicate "until" from kernel/workqueue.c
ite_gpio fix tabbage
fix file specification in comments
...
Fixed trivial path conflicts due to removed files:
arch/mips/dec/boot/decstation.c, drivers/char/ite_gpio.c
Diffstat (limited to 'arch/um')
| -rw-r--r-- | arch/um/Kconfig | 2 | ||||
| -rw-r--r-- | arch/um/Makefile | 2 | ||||
| -rw-r--r-- | arch/um/drivers/line.c | 2 | ||||
| -rw-r--r-- | arch/um/include/sysdep-x86_64/ptrace_user.h | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/arch/um/Kconfig b/arch/um/Kconfig index 76e85bb..d753075 100644 --- a/arch/um/Kconfig +++ b/arch/um/Kconfig @@ -257,7 +257,7 @@ config UML_REAL_TIME_CLOCK UML and spend long times with UML stopped at a breakpoint. In this case, when UML is restarted, it will call the timer enough times to make up for the time spent at the breakpoint. This could result in a - noticable lag. If this is a problem, then disable this option. + noticeable lag. If this is a problem, then disable this option. endmenu diff --git a/arch/um/Makefile b/arch/um/Makefile index f6ad832..c8016a9 100644 --- a/arch/um/Makefile +++ b/arch/um/Makefile @@ -102,7 +102,7 @@ linux: vmlinux define archhelp echo '* linux - Binary kernel image (./linux) - for backward' echo ' compatibility only, this creates a hard link to the' - echo ' real kernel binary, the the "vmlinux" binary you' + echo ' real kernel binary, the "vmlinux" binary you' echo ' find in the kernel root.' endef diff --git a/arch/um/drivers/line.c b/arch/um/drivers/line.c index 24747a4..cfd9f01 100644 --- a/arch/um/drivers/line.c +++ b/arch/um/drivers/line.c @@ -497,7 +497,7 @@ void close_lines(struct line *lines, int nlines) } /* Common setup code for both startup command line and mconsole initialization. - * @lines contains the the array (of size @num) to modify; + * @lines contains the array (of size @num) to modify; * @init is the setup string; */ diff --git a/arch/um/include/sysdep-x86_64/ptrace_user.h b/arch/um/include/sysdep-x86_64/ptrace_user.h index 128faf0..4cd61a8 100644 --- a/arch/um/include/sysdep-x86_64/ptrace_user.h +++ b/arch/um/include/sysdep-x86_64/ptrace_user.h @@ -55,7 +55,7 @@ #define PTRACE_OLDSETOPTIONS 21 #endif -/* These are before the system call, so the the system call number is RAX +/* These are before the system call, so the system call number is RAX * rather than ORIG_RAX, and arg4 is R10 rather than RCX */ #define REGS_SYSCALL_NR PT_INDEX(RAX) |