diff options
| author | David S. Miller | 2008-05-15 09:34:44 +0200 |
|---|---|---|
| committer | David S. Miller | 2008-05-15 09:34:44 +0200 |
| commit | 63fe46da9c380b3f2bbdf3765044649517cc717c (patch) | |
| tree | 9478c1aca1d692b408955aea20c9cd9a37e589c0 /fs/proc/task_mmu.c | |
| parent | Merge branch 'upstream-next' of master.kernel.org:/pub/scm/linux/kernel/git/j... (diff) | |
| parent | isdn/capi: Return proper errnos on module init. (diff) | |
| download | kernel-qcow2-linux-63fe46da9c380b3f2bbdf3765044649517cc717c.tar.gz kernel-qcow2-linux-63fe46da9c380b3f2bbdf3765044649517cc717c.tar.xz kernel-qcow2-linux-63fe46da9c380b3f2bbdf3765044649517cc717c.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/wireless/iwlwifi/iwl-4965-rs.c
drivers/net/wireless/rt2x00/rt61pci.c
Diffstat (limited to 'fs/proc/task_mmu.c')
| -rw-r--r-- | fs/proc/task_mmu.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/fs/proc/task_mmu.c b/fs/proc/task_mmu.c index e2b8e769f510..88717c0f941b 100644 --- a/fs/proc/task_mmu.c +++ b/fs/proc/task_mmu.c @@ -5,11 +5,9 @@ #include <linux/highmem.h> #include <linux/ptrace.h> #include <linux/pagemap.h> -#include <linux/ptrace.h> #include <linux/mempolicy.h> #include <linux/swap.h> #include <linux/swapops.h> -#include <linux/seq_file.h> #include <asm/elf.h> #include <asm/uaccess.h> |