diff options
| author | H. Peter Anvin <hpa@zytor.com> | 2010-05-08 17:59:58 -0400 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2010-05-08 17:59:58 -0400 |
| commit | d7be0ce6afb1df60bc786f57410407ceae92b994 (patch) | |
| tree | 5e91acfc12c833531ad3320f274e0cd96a129973 /fs/proc/array.c | |
| parent | e08cae4181af9483b04ecfac48f01c8e5a5f27bf (diff) | |
| parent | 66f41d4c5c8a5deed66fdcc84509376c9a0bf9d8 (diff) | |
Merge commit 'v2.6.34-rc6' into x86/cpu
Diffstat (limited to 'fs/proc/array.c')
| -rw-r--r-- | fs/proc/array.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/fs/proc/array.c b/fs/proc/array.c index aa8637b81028..e51f2ec2c5e5 100644 --- a/fs/proc/array.c +++ b/fs/proc/array.c | |||
| @@ -68,7 +68,6 @@ | |||
| 68 | #include <linux/hugetlb.h> | 68 | #include <linux/hugetlb.h> |
| 69 | #include <linux/pagemap.h> | 69 | #include <linux/pagemap.h> |
| 70 | #include <linux/swap.h> | 70 | #include <linux/swap.h> |
| 71 | #include <linux/slab.h> | ||
| 72 | #include <linux/smp.h> | 71 | #include <linux/smp.h> |
| 73 | #include <linux/signal.h> | 72 | #include <linux/signal.h> |
| 74 | #include <linux/highmem.h> | 73 | #include <linux/highmem.h> |