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

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

author	David S. Miller <davem@davemloft.net>
	Wed, 27 Mar 2013 17:52:49 +0000 (13:52 -0400)
committer	David S. Miller <davem@davemloft.net>
	Wed, 27 Mar 2013 17:52:49 +0000 (13:52 -0400)
commit	e2a553dbf18a5177fdebe29495c32a8e7fd3a4db
tree	5ccb3d498325a7aaf93f49549eca03cb7861ca1c	tree \| snapshot
parent	7559d97993ae7d552c96313155286f372cf4cf7c	commit \| diff
parent	a8c45289f215e137825bf9630d0abb41c1dc41ff	commit \| diff

Merge git://git./linux/kernel/git/davem/net

Conflicts:
include/net/ipip.h

The changes made to ipip.h in 'net' were already included
in 'net-next' before that header was moved to another location.

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

Domain: System / Kernel;

RSS Atom

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
drivers/infiniband/hw/cxgb4/qp.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c	diff1 \|	diff2 \|	blob \| history
net/bridge/br_fdb.c	diff1 \|	diff2 \|	blob \| history
net/core/dev.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/tcp_input.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/addrconf.c	diff1 \|	diff2 \|	blob \| history