lkml.org 
[lkml]   [2013]   [May]   [2]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [GIT PULL] timer changes for v3.10
On Tue, 30 Apr 2013, Linus Torvalds wrote:
> Both sets of patches were done by Thomas, and I *really* want you guys
> to take a look at my conflict resolution. I effectively moved the new
> "don't go into deep idle if boradcast timer is pending" check from x86
> and arm into the generic idle loop. So my merge resolution is
> semantically quite different from either branch, but the alternative
> seemed to be to remove the new check entirely.
>
> I pushed my merge out, please take a look.

Perfect!

tglx


\
 
 \ /
  Last update: 2013-05-02 13:01    [W:0.097 / U:0.364 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site