diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-10-06 18:16:40 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-10-06 18:16:40 +0200 |
| commit | b159d7a989e53ab3529084348aa80441520b8575 (patch) | |
| tree | 416512130cf80ded4cd88fc064d0b28c8220616f /mm/memcontrol.c | |
| parent | Merge branch 'x86/prototypes' into x86-v28-for-linus-phase1 (diff) | |
| parent | x86, tracehook: clean up implementation of syscall_get_error() (diff) | |
| download | linux-b159d7a989e53ab3529084348aa80441520b8575.tar.xz linux-b159d7a989e53ab3529084348aa80441520b8575.zip | |
Merge branch 'x86/tracehook' into x86-v28-for-linus-phase1
Conflicts:
arch/x86/kernel/signal_64.c
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'mm/memcontrol.c')
0 files changed, 0 insertions, 0 deletions