git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6
[pandora-kernel.git]
/
arch
/
sh
/
kernel
/
setup.c
diff --git
a/arch/sh/kernel/setup.c
b/arch/sh/kernel/setup.c
index
4f26716
..
58bff45
100644
(file)
--- a/
arch/sh/kernel/setup.c
+++ b/
arch/sh/kernel/setup.c
@@
-150,7
+150,7
@@
void __init check_for_initrd(void)
}
/*
- * If we got this far inspite of the boot loader's best efforts
+ * If we got this far in
spite of the boot loader's best efforts
* to the contrary, assume we actually have a valid initrd and
* fix up the root dev.
*/