]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'net/master'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 5 Oct 2011 03:06:13 +0000 (14:06 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 5 Oct 2011 03:06:13 +0000 (14:06 +1100)
commit535ce95939bb2b35b09db0001a7315b4df469fe5
tree7f897606d3b01fd063a337e77d2556b6b7f9d9d6
parentfbce3672dbe91d1189425a456400b8cb03442810
parent83e1b91845403f6322284a6e74581cc47d57de9f
Merge remote-tracking branch 'net/master'

Conflicts:
arch/powerpc/configs/40x/hcu4_defconfig
drivers/s390/cio/qdio_main.c
net/batman-adv/soft-interface.c
40 files changed:
Documentation/networking/ip-sysctl.txt
MAINTAINERS
arch/mips/Kconfig
arch/powerpc/Kconfig
arch/powerpc/configs/ppc40x_defconfig
arch/powerpc/platforms/40x/Kconfig
arch/s390/include/asm/qdio.h
drivers/net/bonding/bond_main.c
drivers/net/cris/eth_v10.c
drivers/net/ethernet/amd/au1000_eth.c
drivers/net/ethernet/amd/au1000_eth.h
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/chelsio/cxgb3/cxgb3_offload.c
drivers/net/ethernet/chelsio/cxgb3/l2t.c
drivers/net/ethernet/chelsio/cxgb3/l2t.h
drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
drivers/net/ethernet/ibm/ibmveth.c
drivers/net/ethernet/mellanox/mlx4/eq.c
drivers/net/ethernet/mellanox/mlx4/mr.c
drivers/net/ethernet/mellanox/mlx4/port.c
drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c
drivers/net/ethernet/toshiba/ps3_gelic_net.c
drivers/net/ethernet/toshiba/ps3_gelic_net.h
drivers/net/phy/dp83640.c
drivers/s390/cio/qdio_main.c
drivers/s390/cio/qdio_setup.c
drivers/s390/net/lcs.c
drivers/scsi/bnx2fc/bnx2fc.h
drivers/scsi/bnx2fc/bnx2fc_fcoe.c
drivers/scsi/fcoe/fcoe.c
drivers/scsi/fcoe/fcoe_transport.c
drivers/staging/Kconfig
drivers/staging/Makefile
include/linux/pci.h
net/batman-adv/soft-interface.c
net/ipv6/tcp_ipv6.c
net/packet/af_packet.c