git.stricted.de - GitHub/LineageOS/android_kernel_motorola

author	David S. Miller <davem@davemloft.net>
	Sat, 20 Aug 2011 17:39:12 +0000 (10:39 -0700)
committer	David S. Miller <davem@davemloft.net>
	Sat, 20 Aug 2011 17:39:12 +0000 (10:39 -0700)
commit	823dcd2506fa369aeb8cbd26da5663efe2fda9a9
tree	853b3e3c05f0b9ee1b5df8464db19b7acc57150c	tree \| snapshot (tar.gz zip)
parent	eaa36660de7e174498618d69d7277d44a2f24c3d	commit \| diff
parent	98e77438aed3cd3343cbb86825127b1d9d2bea33	commit \| diff

Merge branch 'master' of /linux/kernel/git/davem/net

22 files changed:

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
drivers/net/bonding/bond_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/amd/pcnet32.c	diff1 \|	\|	blob \| history
drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c	diff1 \|	\|	blob \| history
drivers/net/ethernet/broadcom/bnx2x/bnx2x_dcb.c	diff1 \|	\|	blob \| history
drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c	diff1 \|	\|	blob \| history
drivers/net/ethernet/broadcom/bnx2x/bnx2x_reg.h	diff1 \|	\|	blob \| history
drivers/net/ethernet/freescale/gianfar.c	diff1 \|	\|	blob \| history
drivers/net/ethernet/freescale/gianfar_ethtool.c	diff1 \|	\|	blob \| history
drivers/net/ethernet/intel/e1000e/82571.c	diff1 \|	\|	blob \| history
drivers/net/ethernet/intel/e1000e/e1000.h	diff1 \|	\|	blob \| history
drivers/net/ethernet/intel/e1000e/ethtool.c	diff1 \|	\|	blob \| history
drivers/net/ethernet/intel/e1000e/ich8lan.c	diff1 \|	\|	blob \| history
drivers/net/ethernet/intel/e1000e/lib.c	diff1 \|	\|	blob \| history
drivers/net/ethernet/intel/e1000e/netdev.c	diff1 \|	\|	blob \| history
drivers/net/ethernet/intel/ixgbe/ixgbe_main.c	diff1 \|	\|	blob \| history
drivers/net/ethernet/nvidia/forcedeth.c	diff1 \|	\|	blob \| history
drivers/net/ethernet/renesas/sh_eth.c	diff1 \|	\|	blob \| history
drivers/net/ethernet/via/via-velocity.c	diff1 \|	\|	blob \| history
drivers/net/vmxnet3/vmxnet3_drv.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/route.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/sit.c	diff1 \|	diff2 \|	blob \| history

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
drivers/net/bonding/bond_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/amd/pcnet32.c	diff1 \|	\|	blob \| history
drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c	diff1 \|	\|	blob \| history
drivers/net/ethernet/broadcom/bnx2x/bnx2x_dcb.c	diff1 \|	\|	blob \| history
drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c	diff1 \|	\|	blob \| history
drivers/net/ethernet/broadcom/bnx2x/bnx2x_reg.h	diff1 \|	\|	blob \| history
drivers/net/ethernet/freescale/gianfar.c	diff1 \|	\|	blob \| history
drivers/net/ethernet/freescale/gianfar_ethtool.c	diff1 \|	\|	blob \| history
drivers/net/ethernet/intel/e1000e/82571.c	diff1 \|	\|	blob \| history
drivers/net/ethernet/intel/e1000e/e1000.h	diff1 \|	\|	blob \| history
drivers/net/ethernet/intel/e1000e/ethtool.c	diff1 \|	\|	blob \| history
drivers/net/ethernet/intel/e1000e/ich8lan.c	diff1 \|	\|	blob \| history
drivers/net/ethernet/intel/e1000e/lib.c	diff1 \|	\|	blob \| history
drivers/net/ethernet/intel/e1000e/netdev.c	diff1 \|	\|	blob \| history
drivers/net/ethernet/intel/ixgbe/ixgbe_main.c	diff1 \|	\|	blob \| history
drivers/net/ethernet/nvidia/forcedeth.c	diff1 \|	\|	blob \| history
drivers/net/ethernet/renesas/sh_eth.c	diff1 \|	\|	blob \| history
drivers/net/ethernet/via/via-velocity.c	diff1 \|	\|	blob \| history
drivers/net/vmxnet3/vmxnet3_drv.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/route.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/sit.c	diff1 \|	diff2 \|	blob \| history