diff options
author | Jiri Kosina <jkosina@suse.cz> | 2010-03-08 16:55:37 +0100 |
---|---|---|
committer | Jiri Kosina <jkosina@suse.cz> | 2010-03-08 16:55:37 +0100 |
commit | 318ae2edc3b29216abd8a2510f3f80b764f06858 (patch) | |
tree | ce595adde342f57f379d277b25e4dd206988a052 /drivers/char/serial167.c | |
parent | 25cf84cf377c0aae5dbcf937ea89bc7893db5176 (diff) | |
parent | 3e58974027b04e84f68b964ef368a6cd758e2f84 (diff) | |
download | linux-3.10-318ae2edc3b29216abd8a2510f3f80b764f06858.tar.gz linux-3.10-318ae2edc3b29216abd8a2510f3f80b764f06858.tar.bz2 linux-3.10-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 'drivers/char/serial167.c')
-rw-r--r-- | drivers/char/serial167.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/serial167.c b/drivers/char/serial167.c index 986aa606a6b..1ec3d5cd748 100644 --- a/drivers/char/serial167.c +++ b/drivers/char/serial167.c @@ -1989,7 +1989,7 @@ void mvme167_serial_console_setup(int cflag) /* * Attempt to set up all channels to something reasonable, and * bang out a INIT_CHAN command. We should then be able to limit - * the ammount of fiddling we have to do in normal running. + * the amount of fiddling we have to do in normal running. */ for (ch = 3; ch >= 0; ch--) { |