Messages in this thread | | | Date | Thu, 2 May 2013 12:22:05 +0200 (CEST) | From | Thomas Gleixner <> | Subject | Re: [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
| |