Messages in this thread | | | Date | Mon, 18 Jan 2010 13:56:24 +1100 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the acpi tree with Linus' tree |
| |
Hi Len,
Today's linux-next merge of the acpi tree got a conflict in drivers/gpu/drm/i915/intel_lvds.c between commit 40f33a92100f4d9b6e85ad642100cfe42d7ff57d ("drm/i915: Add HP nx9020/SamsungSX20S to ACPI LID quirk list") from Linus' tree and commit 25fbdd0b66c193607ed058662e06d29345766c17 ("drm/i915: Add HP nx9020/Samsung SX20S to ACPI LID quirk list") from the acpi tree.
Clearly two (slightly different) versions of the same change. I used the version from the drm tree. -- Cheers, Stephen Rothwell sfr@canb.auug.org.au http://www.canb.auug.org.au/~sfr/ [unhandled content-type:application/pgp-signature] | |