diff options
| author | Arjan van de Ven <arjan@linux.intel.com> | 2008-10-17 12:20:26 -0400 |
|---|---|---|
| committer | Arjan van de Ven <arjan@linux.intel.com> | 2008-10-17 12:20:26 -0400 |
| commit | 651dab4264e4ba0e563f5ff56f748127246e9065 (patch) | |
| tree | 016630974bdcb00fe529b673f96d389e0fd6dc94 /fs/mpage.c | |
| parent | 40b8606253552109815786e5d4b0de98782d31f5 (diff) | |
| parent | 2e532d68a2b3e2aa6b19731501222069735c741c (diff) | |
Merge commit 'linus/master' into merge-linus
Conflicts:
arch/x86/kvm/i8254.c
Diffstat (limited to 'fs/mpage.c')
| -rw-r--r-- | fs/mpage.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/mpage.c b/fs/mpage.c index dbcc7af76a15..552b80b3facc 100644 --- a/fs/mpage.c +++ b/fs/mpage.c | |||
| @@ -6,7 +6,7 @@ | |||
| 6 | * Contains functions related to preparing and submitting BIOs which contain | 6 | * Contains functions related to preparing and submitting BIOs which contain |
| 7 | * multiple pagecache pages. | 7 | * multiple pagecache pages. |
| 8 | * | 8 | * |
| 9 | * 15May2002 akpm@zip.com.au | 9 | * 15May2002 Andrew Morton |
| 10 | * Initial version | 10 | * Initial version |
| 11 | * 27Jun2002 axboe@suse.de | 11 | * 27Jun2002 axboe@suse.de |
| 12 | * use bio_add_page() to build bio's just the right size | 12 | * use bio_add_page() to build bio's just the right size |