diff options
| author | Ingo Molnar <mingo@kernel.org> | 2014-02-28 13:58:25 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2014-02-28 13:58:25 +0100 |
| commit | d27c8438eeedb6e1367b592c101e3c87cca0b50f (patch) | |
| tree | b67aa6b474fb52a1c88134ba089d034cb10ebc71 /scripts/patch-kernel | |
| parent | trace: Replace hardcoding of 19 with MAX_NICE (diff) | |
| parent | Merge branch 'timers.2014.02.25a' of git://git.kernel.org/pub/scm/linux/kerne... (diff) | |
| download | linux-d27c8438eeedb6e1367b592c101e3c87cca0b50f.tar.gz linux-d27c8438eeedb6e1367b592c101e3c87cca0b50f.zip | |
Merge branch 'timers/core' into sched/idle
Avoid heavy conflicts caused by WIP patches in drivers/cpuidle/cpuidle.c,
by merging these into a single base.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'scripts/patch-kernel')
0 files changed, 0 insertions, 0 deletions