linux-next: manual merge of the drop-experimental tree with the net-next tree

2013-01-07 Thread Stephen Rothwell
Hi Kees, Today's linux-next merge of the drop-experimental tree got conflicts in drivers/net/ethernet/8390/Kconfig and drivers/net/ethernet/i825xx/Kconfig between commits 483f777266f5 ("drivers/net: remove orphaned references to micro channel") from the net-next tree and commits 16f5471ff2da

linux-next: manual merge of the drop-experimental tree with the net-next tree

2013-01-07 Thread Stephen Rothwell
Hi Kees, Today's linux-next merge of the drop-experimental tree got conflicts in drivers/net/ethernet/8390/Kconfig and drivers/net/ethernet/i825xx/Kconfig between commits 483f777266f5 (drivers/net: remove orphaned references to micro channel) from the net-next tree and commits 16f5471ff2da

linux-next: manual merge of the drop-experimental tree with the net-next tree

2012-11-26 Thread Stephen Rothwell
Hi Kees, Today's linux-next merge of the drop-experimental tree got a conflict in net/dsa/Kconfig between commit b3422a314c27 ("dsa: Hide core config options; make drivers select what they need") from the net-next tree and commit b8e8d99e4ee8 ("net/dsa: remove depends on CONFIG_EXPERIMENTAL")

linux-next: manual merge of the drop-experimental tree with the net-next tree

2012-11-26 Thread Stephen Rothwell
Hi Kees, Today's linux-next merge of the drop-experimental tree got a conflict in net/dsa/Kconfig between commit b3422a314c27 (dsa: Hide core config options; make drivers select what they need) from the net-next tree and commit b8e8d99e4ee8 (net/dsa: remove depends on CONFIG_EXPERIMENTAL) from

linux-next: manual merge of the drop-experimental tree with the net-next tree

2012-11-01 Thread Stephen Rothwell
Hi Kees, Today's linux-next merge of the drop-experimental tree got a conflict in drivers/net/ethernet/intel/Kconfig between commit a24006ed1261 ("ptp: Enable clock drivers along with associated net/PHY drivers") from the net-next tree and commit 70c5056f413d ("drivers/net/ethernet/intel: remove

linux-next: manual merge of the drop-experimental tree with the net-next tree

2012-11-01 Thread Stephen Rothwell
Hi Kees, Today's linux-next merge of the drop-experimental tree got a conflict in drivers/net/ethernet/intel/Kconfig between commit a24006ed1261 (ptp: Enable clock drivers along with associated net/PHY drivers) from the net-next tree and commit 70c5056f413d (drivers/net/ethernet/intel: remove