]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'net/master'
authorStephen Rothwell <sfr@canb.auug.org.au>
Fri, 19 Aug 2011 00:47:33 +0000 (10:47 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 19 Aug 2011 00:47:33 +0000 (10:47 +1000)
commit9365becdc7382eb74f7bc8c80215932026bb1ca2
treea1ca2c81de7fbd4553adeb103c44ede801c0b01c
parent0fcc6c9e6a7876bef82e3188b83f25e60d83c3c9
parentb489da87ebf7b0c106e45dc7a3c65d9d72ac6bd7
Merge remote-tracking branch 'net/master'
26 files changed:
MAINTAINERS
arch/powerpc/Kconfig
drivers/infiniband/ulp/ipoib/ipoib_main.c
drivers/net/bonding/bond_main.c
drivers/net/cris/eth_v10.c
drivers/net/ethernet/amd/pcnet32.c
drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c
drivers/net/ethernet/broadcom/bnx2x/bnx2x_dcb.c
drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
drivers/net/ethernet/broadcom/bnx2x/bnx2x_reg.h
drivers/net/ethernet/cadence/at91_ether.c
drivers/net/ethernet/freescale/gianfar.c
drivers/net/ethernet/freescale/gianfar_ethtool.c
drivers/net/ethernet/intel/e1000e/82571.c
drivers/net/ethernet/intel/e1000e/e1000.h
drivers/net/ethernet/intel/e1000e/ethtool.c
drivers/net/ethernet/intel/e1000e/ich8lan.c
drivers/net/ethernet/intel/e1000e/lib.c
drivers/net/ethernet/intel/e1000e/netdev.c
drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
drivers/net/ethernet/nvidia/forcedeth.c
drivers/net/ethernet/renesas/sh_eth.c
drivers/net/ethernet/via/via-velocity.c
drivers/net/vmxnet3/vmxnet3_drv.c
net/ipv4/route.c
net/ipv6/sit.c