linux-next: manual merge of the net tree with the pci tree
From: Stephen Rothwell
Date: Mon Jan 03 2011 - 21:29:10 EST
Today's linux-next merge of the net tree got a conflict in
drivers/net/skge.c between commit
1d3c16a818e992c199844954d95c17fd7ce6cbba ("PCI: make pci_restore_state
return void") from the pci tree and commit
7dbf6acdbad2fbc6eea72b58404461dcb7c6d9d2 ("skge: Do not use legacy PCI
power management") from the net tree.
The latter removes the code modified by the former, so I used the latter.
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
Description: PGP signature