diff options
| author | Ingo Molnar <mingo@kernel.org> | 2018-06-04 18:50:32 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2018-06-04 18:50:32 +0200 |
| commit | 24dd064d5b56b12c1346cc5c9c2bc99d168e729f (patch) | |
| tree | 241c9d1da486ce7261dcfed581ff6bff83f66e2c /mm/oom_kill.c | |
| parent | 29dcea88779c856c7dc92040a0c01233263101d4 (diff) | |
| parent | f79b1c573cb4dc551919f81ed5797419f6fc1f3a (diff) | |
| parent | ff987fcf011d20c53b3a613edf6e2055ea48e26e (diff) | |
| parent | 7f8ec5a4f01aa7d03e94a3d99d7b5f9c02d7fe5a (diff) | |
| parent | f2173356e26c4da2ddecf9bf3d58a6a2ff56b11d (diff) | |
| download | linux-24dd064d5b56b12c1346cc5c9c2bc99d168e729f.tar.gz linux-24dd064d5b56b12c1346cc5c9c2bc99d168e729f.tar.bz2 linux-24dd064d5b56b12c1346cc5c9c2bc99d168e729f.zip | |
Merge branches 'x86/dma', 'x86/microcode', 'x86/mm' and 'x86/vdso' into x86/urgent
Merge these small and simple 1-2 commit branches into the urgent branch.
Signed-off-by: Ingo Molnar <mingo@kernel.org>