git.karo-electronics.de Git - karo-tx-linux.git/commit

]> git.karo-electronics.de Git - karo-tx-linux.git/commit

author	Stephen Rothwell <sfr@canb.auug.org.au>
	Fri, 14 Oct 2011 02:19:42 +0000 (13:19 +1100)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Fri, 14 Oct 2011 02:19:42 +0000 (13:19 +1100)
commit	e1c6ac39a152f849a62f62503f2456e8516d3df8
tree	40fddd7608aeae135acc5bcfd01b04a84728e867	tree \| snapshot
parent	5faab0933bd9ac366f3a3e43d43790dea18c67a4	commit \| diff
parent	7ae60b3f3b297b7f04025c93f1cb2275c3a1dfcd	commit \| diff

Merge remote-tracking branch 'net-next/master'

Conflicts:
arch/powerpc/configs/40x/hcu4_defconfig
drivers/s390/cio/qdio_main.c

38 files changed:

Documentation/feature-removal-schedule.txt	diff1 \|	diff2 \|	blob \| history
MAINTAINERS	diff1 \|	diff2 \|	blob \| history
arch/mips/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/powerpc/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/powerpc/configs/ppc40x_defconfig	diff1 \|	diff2 \|	blob \| history
arch/powerpc/platforms/40x/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/s390/include/asm/qdio.h	diff1 \|	diff2 \|	blob \| history
drivers/infiniband/hw/nes/nes_nic.c	diff1 \|	diff2 \|	blob \| history
drivers/infiniband/ulp/ipoib/ipoib_cm.c	diff1 \|	diff2 \|	blob \| history
drivers/net/can/mscan/mscan.c	diff1 \|	diff2 \|	blob \| history
drivers/net/cris/eth_v10.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/amd/au1000_eth.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/amd/au1000_eth.h	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/broadcom/bnx2x/bnx2x.h	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/cadence/at91_ether.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx4/en_tx.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx4/eq.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx4/fw.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx4/fw.h	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx4/main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx4/mlx4.h	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx4/mr.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx4/pd.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx4/port.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx4/qp.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx4/srq.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/toshiba/ps3_gelic_net.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/toshiba/ps3_gelic_net.h	diff1 \|	diff2 \|	blob \| history
drivers/s390/cio/qdio_main.c	diff1 \|	diff2 \|	blob \| history
drivers/s390/cio/qdio_setup.c	diff1 \|	diff2 \|	blob \| history
drivers/s390/net/lcs.c	diff1 \|	diff2 \|	blob \| history
drivers/scsi/bnx2fc/bnx2fc.h	diff1 \|	diff2 \|	blob \| history
drivers/scsi/bnx2fc/bnx2fc_fcoe.c	diff1 \|	diff2 \|	blob \| history
drivers/scsi/fcoe/fcoe.c	diff1 \|	diff2 \|	blob \| history
drivers/scsi/fcoe/fcoe_transport.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/staging/Makefile	diff1 \|	diff2 \|	blob \| history

Linux kernel for KaRo TX COM modules

RSS Atom

Documentation/feature-removal-schedule.txt	diff1 \|	diff2 \|	blob \| history
MAINTAINERS	diff1 \|	diff2 \|	blob \| history
arch/mips/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/powerpc/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/powerpc/configs/ppc40x_defconfig	diff1 \|	diff2 \|	blob \| history
arch/powerpc/platforms/40x/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/s390/include/asm/qdio.h	diff1 \|	diff2 \|	blob \| history
drivers/infiniband/hw/nes/nes_nic.c	diff1 \|	diff2 \|	blob \| history
drivers/infiniband/ulp/ipoib/ipoib_cm.c	diff1 \|	diff2 \|	blob \| history
drivers/net/can/mscan/mscan.c	diff1 \|	diff2 \|	blob \| history
drivers/net/cris/eth_v10.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/amd/au1000_eth.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/amd/au1000_eth.h	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/broadcom/bnx2x/bnx2x.h	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/cadence/at91_ether.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx4/en_tx.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx4/eq.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx4/fw.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx4/fw.h	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx4/main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx4/mlx4.h	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx4/mr.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx4/pd.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx4/port.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx4/qp.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx4/srq.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/toshiba/ps3_gelic_net.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/toshiba/ps3_gelic_net.h	diff1 \|	diff2 \|	blob \| history
drivers/s390/cio/qdio_main.c	diff1 \|	diff2 \|	blob \| history
drivers/s390/cio/qdio_setup.c	diff1 \|	diff2 \|	blob \| history
drivers/s390/net/lcs.c	diff1 \|	diff2 \|	blob \| history
drivers/scsi/bnx2fc/bnx2fc.h	diff1 \|	diff2 \|	blob \| history
drivers/scsi/bnx2fc/bnx2fc_fcoe.c	diff1 \|	diff2 \|	blob \| history
drivers/scsi/fcoe/fcoe.c	diff1 \|	diff2 \|	blob \| history
drivers/scsi/fcoe/fcoe_transport.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/staging/Makefile	diff1 \|	diff2 \|	blob \| history