diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-04-05 19:41:22 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-04-05 19:41:22 -0400 |
| commit | 9efe21cb82b5dbe3b0b2ae4de4eccc64ecb94e95 (patch) | |
| tree | 7ff8833745d2f268f897f6fa4a27263b4a572245 /fs/proc/nommu.c | |
| parent | de18836e447c2dc30120c0919b8db8ddc0401cc4 (diff) | |
| parent | 0221c81b1b8eb0cbb6b30a0ced52ead32d2b4e4c (diff) | |
Merge branch 'linus' into irq/threaded
Conflicts:
include/linux/irq.h
kernel/irq/handle.c
Diffstat (limited to 'fs/proc/nommu.c')
| -rw-r--r-- | fs/proc/nommu.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/proc/nommu.c b/fs/proc/nommu.c index b446d7ad0b0d..7e14d1a04001 100644 --- a/fs/proc/nommu.c +++ b/fs/proc/nommu.c | |||
| @@ -76,7 +76,7 @@ static int nommu_region_show(struct seq_file *m, struct vm_region *region) | |||
| 76 | 76 | ||
| 77 | /* | 77 | /* |
| 78 | * display a list of all the REGIONs the kernel knows about | 78 | * display a list of all the REGIONs the kernel knows about |
| 79 | * - nommu kernals have a single flat list | 79 | * - nommu kernels have a single flat list |
| 80 | */ | 80 | */ |
| 81 | static int nommu_region_list_show(struct seq_file *m, void *_p) | 81 | static int nommu_region_list_show(struct seq_file *m, void *_p) |
| 82 | { | 82 | { |