diff options
| author | David S. Miller <davem@davemloft.net> | 2010-04-13 03:28:45 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-04-13 03:28:45 -0400 |
| commit | 9343af084c7e8911897b0883042ee690cee3aaef (patch) | |
| tree | 6211a4bdc84690bec6530d27a3abb19f5e8bb8f3 /fs/proc/array.c | |
| parent | e182c77cc291456eed127b1472952ddb59a81a9d (diff) | |
| parent | 0d0fb0f9c5fddef4a10242fe3337f00f528a3099 (diff) | |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Conflicts:
lib/Kconfig.debug
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> |