On Fri, Apr 04, 2008 at 01:12:44AM +0200, Rafael J. Wysocki wrote: > From: Rafael J. Wysocki <rjw@xxxxxxx> > > Introduce 'struct pm_ops' and 'struct pm_ext_ops' ('ext' meaning > 'extended') representing suspend and hibernation operations for bus > types, device classes, device types and device drivers. <snip> This is probably because I took a few days to merge this, but it doesn't apply to my tree anymore, with some wierd merge errors that I don't think I can easily resolve without having to totally guess as to what it should be (the apm_32.c area especially...) Care to respin these patches? Sorry for the delay. thanks, greg k-h -- 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