From 4d44fee03ee714a6f4e681fda7e0c7ca7ca048ab Mon Sep 17 00:00:00 2001 From: Gabriel Craciunescu Date: Sat, 20 Oct 2007 02:13:26 +0200 Subject: [PATCH] --- yaml --- r: 71873 b: refs/heads/master c: e9534b3fd7843d1bd5a7a1fe2474a09f72d41ab8 h: refs/heads/master i: 71871: abe8316a4d64acf46321dc67dd52adc5eac099cd v: v3 --- [refs] | 2 +- trunk/Documentation/scsi/arcmsr_spec.txt | 2 +- trunk/mm/migrate.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 504f120c1a34..94f9db810800 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 88a9b03775cbd5124c91f350b89c0dfb9d6550eb +refs/heads/master: e9534b3fd7843d1bd5a7a1fe2474a09f72d41ab8 diff --git a/trunk/Documentation/scsi/arcmsr_spec.txt b/trunk/Documentation/scsi/arcmsr_spec.txt index 5e0042340fd3..45d9482c1517 100644 --- a/trunk/Documentation/scsi/arcmsr_spec.txt +++ b/trunk/Documentation/scsi/arcmsr_spec.txt @@ -3,7 +3,7 @@ ******************************************************************************* ** Usage of IOP331 adapter ** (All In/Out is in IOP331's view) -** 1. Message 0 --> InitThread message and retrun code +** 1. Message 0 --> InitThread message and return code ** 2. Doorbell is used for RS-232 emulation ** inDoorBell : bit0 -- data in ready ** (DRIVER DATA WRITE OK) diff --git a/trunk/mm/migrate.c b/trunk/mm/migrate.c index 4d6ee03db946..6a207e8d17ea 100644 --- a/trunk/mm/migrate.c +++ b/trunk/mm/migrate.c @@ -706,7 +706,7 @@ static int unmap_and_move(new_page_t get_new_page, unsigned long private, * The function returns after 10 attempts or if no pages * are movable anymore because to has become empty * or no retryable pages exist anymore. All pages will be - * retruned to the LRU or freed. + * returned to the LRU or freed. * * Return: Number of pages not migrated or error code. */