git.baikalelectronics.ru Git - kernel.git/commit

]> git.baikalelectronics.ru Git - kernel.git/commit

author	David S. Miller <davem@davemloft.net>
	Sat, 11 Feb 2012 04:32:28 +0000 (23:32 -0500)
committer	David S. Miller <davem@davemloft.net>
	Sat, 11 Feb 2012 04:32:28 +0000 (23:32 -0500)
commit	1a1d03816c16fc45dc168415ecf5c602317d8366
tree	8b1be85ad1af7ee6a0e3e36c77ae738c966c1f21	tree \| snapshot
parent	ce7a2a7978b8bb47aab613490995f15d575e8903	commit \| diff
parent	9e4af2ec05b081b81b0294d913e26f3ef3497e0d	commit \| diff

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

Conflicts:
drivers/infiniband/hw/nes/nes_cm.c

Simple whitespace conflict.

Signed-off-by: David S. Miller <davem@davemloft.net>

17 files changed:

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
drivers/infiniband/hw/nes/nes_cm.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/brocade/bna/bnad_ethtool.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/intel/e1000/e1000_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/intel/igb/igb_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/intel/ixgbe/ixgbe_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/marvell/skge.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx4/cmd.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx4/en_netdev.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx4/en_rx.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/renesas/sh_eth.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/renesas/sh_eth.h	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/via/via-velocity.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/mwifiex/init.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/mwifiex/main.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/tcp_ipv4.c	diff1 \|	diff2 \|	blob \| history

Linux Kernel Source Tree.

RSS Atom

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
drivers/infiniband/hw/nes/nes_cm.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/brocade/bna/bnad_ethtool.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/intel/e1000/e1000_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/intel/igb/igb_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/intel/ixgbe/ixgbe_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/marvell/skge.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx4/cmd.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx4/en_netdev.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx4/en_rx.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/renesas/sh_eth.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/renesas/sh_eth.h	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/via/via-velocity.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/mwifiex/init.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/mwifiex/main.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/tcp_ipv4.c	diff1 \|	diff2 \|	blob \| history