projects / GitHub / LineageOS / G12 / android_kernel_amlogic_linux-4.9.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: b9f8fcd 8bea867)
Merge branch 'linus' into sched/urgent
authorIngo Molnar <mingo@elte.hu>
Wed, 16 Dec 2009 17:33:49 +0000 (18:33 +0100)
committerIngo Molnar <mingo@elte.hu>
Wed, 16 Dec 2009 17:33:49 +0000 (18:33 +0100)
commitee1156c11a1121e118b0a7f2dec240f0d421b1fd
treeb8771cc5a9758af9d7410fc519227c036c222130tree | snapshot (tar.gz zip)
parentb9f8fcd55bbdb037e5332dbdb7b494f0b70861accommit | diff
parent8bea8672edfca7ec5f661cafb218f1205863b343commit | diff
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>
kernel/sched.c diff1 | diff2 | blob | history
kernel/sched_idletask.c diff1 | diff2 | blob | history