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 /include/linux/task_io_accounting.h | |
| parent | 40b8606253552109815786e5d4b0de98782d31f5 (diff) | |
| parent | 2e532d68a2b3e2aa6b19731501222069735c741c (diff) | |
Merge commit 'linus/master' into merge-linus
Conflicts:
arch/x86/kvm/i8254.c
Diffstat (limited to 'include/linux/task_io_accounting.h')
| -rw-r--r-- | include/linux/task_io_accounting.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/task_io_accounting.h b/include/linux/task_io_accounting.h index 5e88afc9a2fb..bdf855c2856f 100644 --- a/include/linux/task_io_accounting.h +++ b/include/linux/task_io_accounting.h | |||
| @@ -5,7 +5,7 @@ | |||
| 5 | * Don't include this header file directly - it is designed to be dragged in via | 5 | * Don't include this header file directly - it is designed to be dragged in via |
| 6 | * sched.h. | 6 | * sched.h. |
| 7 | * | 7 | * |
| 8 | * Blame akpm@osdl.org for all this. | 8 | * Blame Andrew Morton for all this. |
| 9 | */ | 9 | */ |
| 10 | 10 | ||
| 11 | struct task_io_accounting { | 11 | struct task_io_accounting { |