diff options
author | Ingo Molnar <mingo@kernel.org> | 2014-02-02 09:45:39 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2014-02-02 09:45:39 +0100 |
commit | eaa4e4fcf1b5c60e656d93242f7fe422173f25b2 (patch) | |
tree | c05d5d6ca3f625d72a9d136b4c485d3dc9472089 /kernel/crash_dump.c | |
parent | sched/numa: Turn some magic numbers into #defines (diff) | |
parent | Merge branch 'misc' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/k... (diff) | |
download | linux-eaa4e4fcf1b5c60e656d93242f7fe422173f25b2.tar.xz linux-eaa4e4fcf1b5c60e656d93242f7fe422173f25b2.zip |
Merge branch 'linus' into sched/core, to resolve conflicts
Conflicts:
kernel/sysctl.c
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'kernel/crash_dump.c')
0 files changed, 0 insertions, 0 deletions