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 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/