Hi Len,
Today's linux-next merge of the acpi tree got a conflict in
drivers/pnp/quirks.c between commit
2e532d68a2b3e2aa6b19731501222069735c741c ("{pci,pnp} quirks.c: don't use
deprecated print_fn_descriptor_symbol()") from Linus' tree and commit
2f53432c2aedbe79020e44525eb069d9138a01dd ("PNP: convert to using pnp_dbg
()") from the acpi tree.
I used the acpi tree version (since it was just a follow on from Linus'
version).
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/
Attachment:
pgpQk1SoPncfb.pgp
Description: PGP signature
