From: Ingo Molnar <mingo@elte.hu>
Date: Wed, 25 Jun 2008 10:26:59 +0000 (+0200)
Subject: Merge branch 'linus' into sched/devel
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=f57aec5a871907427060196f6bac3d0011b38450;p=GitHub%2FLineageOS%2Fandroid_kernel_samsung_universal7580.git

Merge branch 'linus' into sched/devel

Conflicts:

	kernel/sched_rt.c

Signed-off-by: Ingo Molnar <mingo@elte.hu>
---

f57aec5a871907427060196f6bac3d0011b38450