diff options
| author | Mark Brown | 2011-04-18 19:07:43 +0200 |
|---|---|---|
| committer | Mark Brown | 2011-04-18 19:07:43 +0200 |
| commit | d5381e42f64ca19f05c5799ffae5708acb6ed411 (patch) | |
| tree | 8b5e757a9847047102c475c6c583afc191d02e5b /arch/unicore32/kernel/head.S | |
| parent | Merge branch 'for-2.6.39' into for-2.6.40 (diff) | |
| parent | ASoC: add a module alias to the FSI driver (diff) | |
| download | kernel-qcow2-linux-d5381e42f64ca19f05c5799ffae5708acb6ed411.tar.gz kernel-qcow2-linux-d5381e42f64ca19f05c5799ffae5708acb6ed411.tar.xz kernel-qcow2-linux-d5381e42f64ca19f05c5799ffae5708acb6ed411.zip | |
ASoC: Merge branch 'for-2.6.39' into for-2.6.40
Fix trivial conflict caused by silly spelling fix patch.
Conflicts:
sound/soc/codecs/wm8994.c
Diffstat (limited to 'arch/unicore32/kernel/head.S')
| -rw-r--r-- | arch/unicore32/kernel/head.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/unicore32/kernel/head.S b/arch/unicore32/kernel/head.S index 92255f3ab6a7..8caf322e110d 100644 --- a/arch/unicore32/kernel/head.S +++ b/arch/unicore32/kernel/head.S @@ -164,7 +164,7 @@ ENTRY(stext) ENDPROC(stext) /* - * Enable the MMU. This completely changes the stucture of the visible + * Enable the MMU. This completely changes the structure of the visible * memory space. You will not be able to trace execution through this. * * r0 = cp#0 control register |