]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'net-next/master'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 12 Oct 2011 02:06:37 +0000 (13:06 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 12 Oct 2011 02:06:37 +0000 (13:06 +1100)
commit574c2b040338efd7a351a8d94c0647887e5b64c6
tree3981a2386d1427104f1d80cd5098d806c272e8f7
parent251810e2015b276781285996007109d5f00197b2
parent9687c637388f63b87fcc18eee6e65bcfca4f49ca
Merge remote-tracking branch 'net-next/master'

Conflicts:
arch/powerpc/configs/40x/hcu4_defconfig
drivers/s390/cio/qdio_main.c
30 files changed:
Documentation/feature-removal-schedule.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/infiniband/hw/nes/nes_nic.c
drivers/net/can/mscan/mscan.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.h
drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h
drivers/net/ethernet/cadence/at91_ether.c
drivers/net/ethernet/mellanox/mlx4/en_tx.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/toshiba/ps3_gelic_net.c
drivers/net/ethernet/toshiba/ps3_gelic_net.h
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