On Tue, Mar 12, 2013 at 3:06 AM, Florian Vaussard <florian.vauss...@epfl.ch> wrote: > Hi Bryan, > > >>>>> >>>>> Bryan, I assume that you'll be taking this? It doesn't apply cleanly to >>>>> my tree, probably because of Peter's recent changes that you took >>>>> through your tree and Florian based his patches on top of that. The >>>>> conflict resolution should be trivial, though. >>>>> >>>> >>>> It seems that this patch was not taken. Could you pull it, as the other >>>> part is already in linux-pwm? Or is there any show stopper? >>>> >>> >>> Ping? Who should merge this? >> >> >> I assume Bryan will take it through the LED tree? Patches 1 & 2 went >> into v3.9-rc1 through the PWM tree. >> > > Ping ? >
Hi Florian and Thierry, Sorry, guys. My bad! I'm using GMAIL filtering my emails. This email goes into my arm-linux mail list archive and I totally missed it. I can merge this patch into my for-next branch, but it will be in 3.10 not 3.9-rcX. Or Thierry, can you merge that to 3.9-rcX through your tree with my Ack? Thanks, -Bryan -- 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/