et131x: Add PCIe gigabit ethernet driver et131x to drivers/net

This adds the ethernet driver for Agere et131x devices to
drivers/net/ethernet.

The driver being added has been in the staging tree for some time, and will be
removed from there in a seperate patch. This one merely disables the staging
version to prevent two instances being built.

Signed-off-by: Mark Einon <mark.einon@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/net/ethernet/Kconfig
Simple merge

diff --cc drivers/net/ethernet/Makefile
Simple merge

diff --cc drivers/net/ethernet/agere/Kconfig
Simple merge

diff --cc drivers/net/ethernet/agere/Makefile
Simple merge

diff --cc drivers/net/ethernet/agere/et131x.c
Simple merge

diff --cc drivers/net/ethernet/agere/et131x.h
Simple merge

diff --cc drivers/staging/Kconfig
Simple merge

diff --cc drivers/staging/Makefile
Simple merge