On Tuesday 14 October 2008 10:23:53 pm Stephen Rothwell wrote:
> Hi Len,
>
> Today's linux-next merge of the acpi tree got a conflict in
> drivers/pnp/Makefile between commit
> ed458df4d2470adc02762a87a9ad665d0b1a2bd4 ("PnP: move pnpacpi/pnpbios_init
> to after PCI init") from Linus' tree and commit
> ac88a8f3f7df04774b386ddaf586040adb819b58 ("PNP: remove old
> CONFIG_PNP_DEBUG option") from the acpi tree.
>
> Really just a context problem. I fixed it up (see below).
Your fixup looks good, thanks.
Bjorn
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
