diff options
| author | Dan Williams <dan.j.williams@intel.com> | 2010-05-17 19:30:58 -0400 |
|---|---|---|
| committer | Dan Williams <dan.j.williams@intel.com> | 2010-05-17 19:30:58 -0400 |
| commit | 0b28330e39bbe0ffee4c56b09fc415fcec595ea3 (patch) | |
| tree | fcf504879883763557e696eff81427b1ab78f76b /fs/proc/stat.c | |
| parent | 058276303dbc4ed089c1f7dad0871810b1f5ddf1 (diff) | |
| parent | caa20d974c86af496b419eef70010e63b7fab7ac (diff) | |
Merge branch 'ioat' into dmaengine
Diffstat (limited to 'fs/proc/stat.c')
| -rw-r--r-- | fs/proc/stat.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/fs/proc/stat.c b/fs/proc/stat.c index b9b7aad2003d..bf31b03fc275 100644 --- a/fs/proc/stat.c +++ b/fs/proc/stat.c | |||
| @@ -1,6 +1,5 @@ | |||
| 1 | #include <linux/cpumask.h> | 1 | #include <linux/cpumask.h> |
| 2 | #include <linux/fs.h> | 2 | #include <linux/fs.h> |
| 3 | #include <linux/gfp.h> | ||
| 4 | #include <linux/init.h> | 3 | #include <linux/init.h> |
| 5 | #include <linux/interrupt.h> | 4 | #include <linux/interrupt.h> |
| 6 | #include <linux/kernel_stat.h> | 5 | #include <linux/kernel_stat.h> |