diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2010-03-08 10:55:37 -0500 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2010-03-08 10:55:37 -0500 |
| commit | 318ae2edc3b29216abd8a2510f3f80b764f06858 (patch) | |
| tree | ce595adde342f57f379d277b25e4dd206988a052 /scripts | |
| parent | 25cf84cf377c0aae5dbcf937ea89bc7893db5176 (diff) | |
| parent | 3e58974027b04e84f68b964ef368a6cd758e2f84 (diff) | |
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 'scripts')
| -rw-r--r-- | scripts/gfp-translate | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/gfp-translate b/scripts/gfp-translate index 073cb6d152a0..d81b968d864e 100644 --- a/scripts/gfp-translate +++ b/scripts/gfp-translate | |||
| @@ -19,7 +19,7 @@ usage() { | |||
| 19 | exit 0 | 19 | exit 0 |
| 20 | } | 20 | } |
| 21 | 21 | ||
| 22 | # Parse command-line arguements | 22 | # Parse command-line arguments |
| 23 | while [ $# -gt 0 ]; do | 23 | while [ $# -gt 0 ]; do |
| 24 | case $1 in | 24 | case $1 in |
| 25 | --source) | 25 | --source) |