diff options
| author |   Ingo Molnar <mingo@elte.hu> | 2009-12-16 18:33:49 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-12-16 18:33:49 +0100 |
| commit | ee1156c11a1121e118b0a7f2dec240f0d421b1fd (patch) | |
| tree | b8771cc5a9758af9d7410fc519227c036c222130 /kernel/cpu.c | |
| parent | sched: Fix cpu_clock() in NMIs, on !CONFIG_HAVE_UNSTABLE_SCHED_CLOCK (diff) | |
| parent | mfd: compile fix for twl4030 renaming (diff) | |
| download | linux-dev-ee1156c11a1121e118b0a7f2dec240f0d421b1fd.tar.xz linux-dev-ee1156c11a1121e118b0a7f2dec240f0d421b1fd.zip | |
Merge branch 'linus' into sched/urgent
Conflicts:
kernel/sched_idletask.c
Merge reason: resolve the conflicts, pick up latest changes.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'kernel/cpu.c')
0 files changed, 0 insertions, 0 deletions