Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

Conflicts:
	drivers/net/forcedeth.c

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/net/3c509.c
Simple merge

diff --cc drivers/net/Makefile
Simple merge

diff --cc drivers/net/atl1e/atl1e_main.c
Simple merge

diff --cc drivers/net/atlx/atl1.c
Simple merge

diff --cc drivers/net/bfin_mac.c
Simple merge

diff --cc drivers/net/cxgb3/adapter.h
Simple merge

diff --cc drivers/net/cxgb3/cxgb3_main.c
Simple merge

diff --cc drivers/net/cxgb3/sge.c
Simple merge

diff --cc drivers/net/cxgb3/t3_hw.c
Simple merge

diff --cc drivers/net/e1000/e1000_main.c
Simple merge

diff --cc drivers/net/forcedeth.c
index d0b1d9f17a5d08d81ecb1c499f3c997894fb29a1,9f6a68fb7b4573cb5ca5a91e9fb0bd2206927007..1dce5550f5532dea7f32489aeb6050a0f11d5428
--- 1/drivers/net/forcedeth.c
--- 2/drivers/net/forcedeth.c
+++ b/drivers/net/forcedeth.c
@@@ -5534,8 -5522,7 +5543,8 @@@ static int nv_close(struct net_device *
  
        nv_drain_rxtx(dev);
  
-       if (np->wolenabled) {
+       if (np->wolenabled || !phy_power_down) {
 +              nv_txrx_gate(dev, false);
                writel(NVREG_PFF_ALWAYS|NVREG_PFF_MYADDR, base + NvRegPacketFilterFlags);
                nv_start_rx(dev);
        } else {

diff --cc drivers/net/gianfar.h
Simple merge

diff --cc drivers/net/mac8390.c
Simple merge

diff --cc drivers/net/mlx4/en_tx.c
Simple merge

diff --cc drivers/net/r8169.c
Simple merge

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

diff --cc drivers/net/wireless/at76c50x-usb.c
Simple merge

diff --cc drivers/net/wireless/rtl818x/rtl8187_dev.c
Simple merge

diff --cc net/sched/cls_cgroup.c
Simple merge