linux-next: manual merge of the drop-experimental tree with Linus'and the net-next trees
From: Stephen Rothwell
Date: Mon Jan 07 2013 - 22:19:19 EST
Today's linux-next merge of the drop-experimental tree got a conflict in
drivers/net/ethernet/intel/Kconfig between commit c56283034ce2 ("pps,
ptp: Remove dependencies on EXPERIMENTAL") from Linus' tree, commit
483f777266f5 ("drivers/net: remove orphaned references to micro channel")
from the net-next tree and commit a9270b9a8436
("drivers/net/ethernet/intel: remove depends on CONFIG_EXPERIMENTAL")
from the drop-experimental tree.
I fixed it up and can carry the fix as necessary (no action is required).
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
Description: PGP signature