diff options
| author |   Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-04 16:34:57 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-04 16:34:57 -0800 |
| commit | 52347f4e810ba323d02cd2c26b5d738f4a2c3d5e (patch) | |
| tree | d956016f7aefff1030ca0f7885ac6a6f890a9e94 /scripts | |
| parent | Merge branch 'upstream' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev (diff) | |
| parent | Documentation/filesystems/00-INDEX: remove entry for fat_cvf.txt (diff) | |
| download | linux-dev-52347f4e810ba323d02cd2c26b5d738f4a2c3d5e.tar.xz linux-dev-52347f4e810ba323d02cd2c26b5d738f4a2c3d5e.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/binoffset.c | 2 | ||||
| -rwxr-xr-x | scripts/checkversion.pl | 2 | ||||
| -rw-r--r-- | scripts/kconfig/util.c | 2 | ||||
| -rwxr-xr-x | scripts/patch-kernel | 4 |
4 files changed, 5 insertions, 5 deletions
diff --git a/scripts/binoffset.c b/scripts/binoffset.c index 591309d85518..1a2e39b8e3e5 100644 --- a/scripts/binoffset.c +++ b/scripts/binoffset.c @@ -1,6 +1,6 @@ /*************************************************************************** * binoffset.c - * (C) 2002 Randy Dunlap <rddunlap@osdl.org> + * (C) 2002 Randy Dunlap <rdunlap@xenotime.net> # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/scripts/checkversion.pl b/scripts/checkversion.pl index df10db662eb1..9f84e562318d 100755 --- a/scripts/checkversion.pl +++ b/scripts/checkversion.pl @@ -3,7 +3,7 @@ # checkversion find uses of LINUX_VERSION_CODE, KERNEL_VERSION, or # UTS_RELEASE without including <linux/version.h>, or cases of # including <linux/version.h> that don't need it. -# Copyright (C) 2003, Randy Dunlap <rddunlap@osdl.org> +# Copyright (C) 2003, Randy Dunlap <rdunlap@xenotime.net> $| = 1; diff --git a/scripts/kconfig/util.c b/scripts/kconfig/util.c index 1fa4c0b801b3..4556014f2f00 100644 --- a/scripts/kconfig/util.c +++ b/scripts/kconfig/util.c @@ -101,7 +101,7 @@ void str_printf(struct gstr *gs, const char *fmt, ...) va_end(ap); } -/* Retreive value of growable string */ +/* Retrieve value of growable string */ const char *str_get(struct gstr *gs) { return gs->s; diff --git a/scripts/patch-kernel b/scripts/patch-kernel index f2d47ca9c8fa..67e4b1868e50 100755 --- a/scripts/patch-kernel +++ b/scripts/patch-kernel @@ -45,7 +45,7 @@ # update usage message; # fix some whitespace damage; # be smarter about stopping when current version is larger than requested; -# Randy Dunlap <rddunlap@osdl.org>, 2004-AUG-18. +# Randy Dunlap <rdunlap@xenotime.net>, 2004-AUG-18. # # Add better support for (non-incremental) 2.6.x.y patches; # If an ending version number if not specified, the script automatically @@ -56,7 +56,7 @@ # patch-kernel does not normally support reverse patching, but does so when # applying EXTRAVERSION (x.y) patches, so that moving from 2.6.11.y to 2.6.11.z # is easy and handled by the script (reverse 2.6.11.y and apply 2.6.11.z). -# Randy Dunlap <rddunlap@osdl.org>, 2005-APR-08. +# Randy Dunlap <rdunlap@xenotime.net>, 2005-APR-08. PNAME=patch-kernel |