Hi Len, Today's linux-next merge of the acpi tree got a conflict in drivers/acpi/blacklist.c between commit a6e0887f21bbab337ee32d9c0a84d7c0b6e9141b ("ACPI: delete OSI(Linux) DMI dmesg spam") from Linus' tree and commit 865596071bb89ec67a44b0ef2da172e0e733ce16 ("ACPI: delete OSI(Linux) DMI dmesg spam") from the acpi tree. The former had a slightly later commit time, so I used that. Please fix up the conflict in the acpi tree. -- Cheers, Stephen Rothwell sfr@xxxxxxxxxxxxxxxx http://www.canb.auug.org.au/~sfr/
Attachment:
pgp55I4Qktfrj.pgp
Description: PGP signature