On Wed, 24 Jun 2009, Corentin Chary wrote: > On Wed, Jun 24, 2009 at 7:41 AM, Len Brown<lenb@xxxxxxxxxx> wrote: > > Unfortunately, upstream scribbed more rfkill stuff on eeepc-laptop.c > > I did take a swing at merging the conflicts, but got lost. > > So it is probably best if you refresh those last 8 eeepc-laptop.c > > patches and send them again. > Isn't that fixed by http://lkml.org/lkml/2009/6/21/169 ? Hmm, apparently so -- I didn't receive that note. I suppose if Stephen signed off on it, I could have applied it and not dropped the tail of your patch series from rc1... Anyway, thanks for refreshing the patches, I've checked them in and they'll be in my -rc2 push. cheers, Len Brown, Intel Open Source Technology Center -- To unsubscribe from this list: send the line "unsubscribe linux-acpi" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html