diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-10-19 13:04:47 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-10-19 13:04:47 -0400 |
| commit | 3e10e879a8c334a5927d800a3663a24d562cfa31 (patch) | |
| tree | 5d18bc7e38c986a044e99aa0d0a4aff4931ec7d0 /include/linux/journal-head.h | |
| parent | 98d9c66ab07471006fd7910cb16453581c41a3e7 (diff) | |
| parent | 0cfd81031a26717fe14380d18275f8e217571615 (diff) | |
Merge branch 'linus' into tracing-v28-for-linus-v3
Conflicts:
init/main.c
kernel/module.c
scripts/bootgraph.pl
Diffstat (limited to 'include/linux/journal-head.h')
| -rw-r--r-- | include/linux/journal-head.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/journal-head.h b/include/linux/journal-head.h index 8a62d1e84b9b..bb70ebb6a2d5 100644 --- a/include/linux/journal-head.h +++ b/include/linux/journal-head.h | |||
| @@ -3,7 +3,7 @@ | |||
| 3 | * | 3 | * |
| 4 | * buffer_head fields for JBD | 4 | * buffer_head fields for JBD |
| 5 | * | 5 | * |
| 6 | * 27 May 2001 Andrew Morton <akpm@digeo.com> | 6 | * 27 May 2001 Andrew Morton |
| 7 | * Created - pulled out of fs.h | 7 | * Created - pulled out of fs.h |
| 8 | */ | 8 | */ |
| 9 | 9 | ||