review.tizen.org Git - platform/kernel/linux-stable.git/commit

projects / platform / kernel / linux-stable.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: d9dd966 8df54d6)

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	d5ef8a4d87ab21d575ac86366599c9152a28028d
tree	8b1be85ad1af7ee6a0e3e36c77ae738c966c1f21	tree \| snapshot
parent	d9dd966d7fc088a6bed991c2b1e2fba4485e0a31	commit \| diff
parent	8df54d622a120058ee8bec38743c9b8f091c8e58	commit \| diff

Merge branch 'master' of git://git./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

Domain: System / Kernel;