From: Ingo Molnar Date: Wed, 21 Jul 2010 19:45:02 +0000 (+0200) Subject: Merge branch 'linus' into sched/core X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=dca45ad8af54963c005393a484ad117b8ba6150f;p=GitHub%2Fmt8127%2Fandroid_kernel_alcatel_ttab.git Merge branch 'linus' into sched/core Merge reason: Move from the -rc3 to the almost-rc6 base. Signed-off-by: Ingo Molnar --- dca45ad8af54963c005393a484ad117b8ba6150f