diff options
author | Linus Torvalds | 2006-01-10 02:06:53 +0100 |
---|---|---|
committer | Linus Torvalds | 2006-01-10 02:06:53 +0100 |
commit | a457aa6c2bdd743bbbffd3f9e4fdbd8c71f8af1b (patch) | |
tree | 23b1109d5d286d1e96424f0195ed8c3144e04eb1 /arch/powerpc/kernel/setup_64.c | |
parent | [PATCH] rcu: don't set ->next_pending in rcu_start_batch() (diff) | |
parent | Small fixups to the EHCI Kconfig help text (diff) | |
download | kernel-qcow2-linux-a457aa6c2bdd743bbbffd3f9e4fdbd8c71f8af1b.tar.gz kernel-qcow2-linux-a457aa6c2bdd743bbbffd3f9e4fdbd8c71f8af1b.tar.xz kernel-qcow2-linux-a457aa6c2bdd743bbbffd3f9e4fdbd8c71f8af1b.zip |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial
Diffstat (limited to 'arch/powerpc/kernel/setup_64.c')
-rw-r--r-- | arch/powerpc/kernel/setup_64.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/kernel/setup_64.c b/arch/powerpc/kernel/setup_64.c index 98e9f0595dd8..81567e931260 100644 --- a/arch/powerpc/kernel/setup_64.c +++ b/arch/powerpc/kernel/setup_64.c @@ -438,7 +438,7 @@ void __init setup_system(void) /* * Fill the ppc64_caches & systemcfg structures with informations - * retreived from the device-tree. Need to be called before + * retrieved from the device-tree. Need to be called before * finish_device_tree() since the later requires some of the * informations filled up here to properly parse the interrupt * tree. |