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, 30 Sep 2011 01:20:11 +0000 (11:20 +1000)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Fri, 30 Sep 2011 01:20:11 +0000 (11:20 +1000)
commit	8610f5b3d23f904d9a0b186821d9dd7bd1766139
tree	f3e99f71f91d39ef5f2f971d812d501f4a3cf197	tree \| snapshot
parent	8e064c11cbf636b9a7c5a0e123afbdc4f5a0320c	commit \| diff
parent	3869f80605847b2235b9be01e59606d9b5606d96	commit \| diff

Merge remote-tracking branch 'net/master'

Conflicts:
arch/powerpc/configs/40x/hcu4_defconfig
drivers/net/wireless/iwlwifi/iwl-scan.c
drivers/s390/cio/qdio_main.c
net/batman-adv/soft-interface.c

42 files changed:

Documentation/networking/ip-sysctl.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/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_dcb.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/broadcom/bnx2x/bnx2x_reg.h	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/cadence/at91_ether.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/chelsio/cxgb3/cxgb3_offload.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/chelsio/cxgb3/l2t.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/chelsio/cxgb3/l2t.h	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/ibm/ibmveth.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx4/eq.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx4/mr.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx4/port.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/net/phy/dp83640.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/ath9k/ar9003_2p2_initvals.h	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/ath9k/recv.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlegacy/iwl3945-base.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlegacy/iwl4965-base.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/iwl-scan.c	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
net/batman-adv/soft-interface.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/tcp_ipv6.c	diff1 \|	diff2 \|	blob \| history
net/wireless/nl80211.c	diff1 \|	diff2 \|	blob \| history

Linux kernel for KaRo TX COM modules

RSS Atom

Documentation/networking/ip-sysctl.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/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_dcb.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/broadcom/bnx2x/bnx2x_reg.h	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/cadence/at91_ether.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/chelsio/cxgb3/cxgb3_offload.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/chelsio/cxgb3/l2t.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/chelsio/cxgb3/l2t.h	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/ibm/ibmveth.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx4/eq.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx4/mr.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx4/port.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/net/phy/dp83640.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/ath9k/ar9003_2p2_initvals.h	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/ath9k/recv.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlegacy/iwl3945-base.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlegacy/iwl4965-base.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/iwl-scan.c	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
net/batman-adv/soft-interface.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/tcp_ipv6.c	diff1 \|	diff2 \|	blob \| history
net/wireless/nl80211.c	diff1 \|	diff2 \|	blob \| history