Messages in this thread | | | From | "Rafael J. Wysocki" <> | Subject | Re: linux-next: manual merge of the idle tree with the pm tree | Date | Fri, 15 Nov 2013 16:22:45 +0100 |
| |
On Friday, November 15, 2013 12:23:29 PM Stephen Rothwell wrote: > Hi Len, > > Today's linux-next merge of the idle tree got a conflict in > drivers/idle/intel_idle.c between commit fab04b2208dd ("intel_idle: > Support Intel Atom Processor C2000 Product Family") from the pm tree and > commit 0654c50d7a0b ("intel_idle: Support Intel Atom Processor C2000 > Product Family") from the idle tree. > > I fixed it up (I used the version from the pm tree since it was much > newer) and can carry the fix as necessary (no action is required).
Thanks for fixing this up!
Rafael [unhandled content-type:application/pgp-signature] | |