diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-04-07 14:14:49 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-04-07 14:14:49 -0400 |
| commit | 42933bac11e811f02200c944d8562a15f8ec4ff0 (patch) | |
| tree | fcdd9afe56eb0e746565ddd1f92f22d36678b843 /arch/cris/boot | |
| parent | 2b9accbee563f535046ff2cd382d0acaa92e130c (diff) | |
| parent | 25985edcedea6396277003854657b5f3cb31a628 (diff) | |
Merge branch 'for-linus2' of git://git.profusion.mobi/users/lucas/linux-2.6
* 'for-linus2' of git://git.profusion.mobi/users/lucas/linux-2.6:
Fix common misspellings
Diffstat (limited to 'arch/cris/boot')
| -rw-r--r-- | arch/cris/boot/rescue/head_v10.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/cris/boot/rescue/head_v10.S b/arch/cris/boot/rescue/head_v10.S index 2fafe247a25b..af55df0994b3 100644 --- a/arch/cris/boot/rescue/head_v10.S +++ b/arch/cris/boot/rescue/head_v10.S | |||
| @@ -7,7 +7,7 @@ | |||
| 7 | * for each partition that this code should check. | 7 | * for each partition that this code should check. |
| 8 | * | 8 | * |
| 9 | * If any of the checksums fail, we assume the flash is so | 9 | * If any of the checksums fail, we assume the flash is so |
| 10 | * corrupt that we cant use it to boot into the ftp flash | 10 | * corrupt that we can't use it to boot into the ftp flash |
| 11 | * loader, and instead we initialize the serial port to | 11 | * loader, and instead we initialize the serial port to |
| 12 | * receive a flash-loader and new flash image. we dont include | 12 | * receive a flash-loader and new flash image. we dont include |
| 13 | * any flash code here, but just accept a certain amount of | 13 | * any flash code here, but just accept a certain amount of |