Subject: linux-next: manual merge of the pci tree with the pci-current tree

From: Stephen Rothwell <[email-masked]>
Date: Fri, 6 Feb 2009 13:50:41 +1100

Hi Jesse,

Today's linux-next merge of the pci tree got a conflict in
drivers/pci/pcie/portdrv_pci.c between commit
27be54a65c89c4b4aa9b25fc6fba31ffd01a08ca ("PCI: PCIe portdrv: Simplify
suspend and resume") from the pci-current tree and commit
120d3f44dd4c7a16ac71f26d4ff44ad7498cb81a ("PCI: PCIe portdrv: Implement
pm object") from the pci tree.

I fixed it up (I used the pci tree version) and assume it will be fixed in
the pci tree soon.
-- 
Cheers,
Stephen Rothwell                    [email-masked]
http://www.canb.auug.org.au/~sfr/