Subject: linux-next: manual merge of the acpi tree

From: Stephen Rothwell <[email-masked]>
Date: Mon, 20 Oct 2008 15:45:52 +1100

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                    [email-masked]
http://www.canb.auug.org.au/~sfr/