git.openwrt.org Git - openwrt/staging/blogic.git/commit

projects / openwrt / staging / blogic.git / commit

author	David S. Miller <davem@davemloft.net>
	Mon, 27 Feb 2012 02:55:51 +0000 (21:55 -0500)
committer	David S. Miller <davem@davemloft.net>
	Mon, 27 Feb 2012 02:55:51 +0000 (21:55 -0500)
commit	ff4783ce78c08d2990126ce1874250ae8e72bbd2
tree	5c95885a4ab768101dd72942b57c238d452a7565	tree \| snapshot
parent	622121719934f60378279eb440d3cec2fc3176d2	commit \| diff
parent	203738e548cefc3fc3c2f73a9063176c9f3583d5	commit \| diff

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

Conflicts:
drivers/net/ethernet/sfc/rx.c

Overlapping changes in drivers/net/ethernet/sfc/rx.c, one to change
the rx_buf->is_page boolean into a set of u16 flags, and another to
adjust how ->ip_summed is initialized.

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

22 files changed:

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
drivers/net/can/sja1000/sja1000.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/atheros/atl1c/atl1c_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/broadcom/b44.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/broadcom/cnic.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/cisco/enic/enic_pp.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/jme.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx4/main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx4/mlx4.h	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/micrel/ks8851_mll.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/sfc/rx.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/ti/davinci_emac.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ppp/ppp_generic.c	diff1 \|	diff2 \|	blob \| history
drivers/net/vmxnet3/vmxnet3_drv.c	diff1 \|	diff2 \|	blob \| history
include/linux/skbuff.h	diff1 \|	diff2 \|	blob \| history
net/atm/clip.c	diff1 \|	diff2 \|	blob \| history
net/core/neighbour.c	diff1 \|	diff2 \|	blob \| history
net/core/rtnetlink.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/ip_gre.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/ping.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/ndisc.c	diff1 \|	diff2 \|	blob \| history
net/netfilter/nf_conntrack_netlink.c	diff1 \|	diff2 \|	blob \| history

John Crispins staging tree

RSS Atom

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
drivers/net/can/sja1000/sja1000.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/atheros/atl1c/atl1c_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/broadcom/b44.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/broadcom/cnic.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/cisco/enic/enic_pp.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/jme.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx4/main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx4/mlx4.h	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/micrel/ks8851_mll.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/sfc/rx.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/ti/davinci_emac.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ppp/ppp_generic.c	diff1 \|	diff2 \|	blob \| history
drivers/net/vmxnet3/vmxnet3_drv.c	diff1 \|	diff2 \|	blob \| history
include/linux/skbuff.h	diff1 \|	diff2 \|	blob \| history
net/atm/clip.c	diff1 \|	diff2 \|	blob \| history
net/core/neighbour.c	diff1 \|	diff2 \|	blob \| history
net/core/rtnetlink.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/ip_gre.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/ping.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/ndisc.c	diff1 \|	diff2 \|	blob \| history
net/netfilter/nf_conntrack_netlink.c	diff1 \|	diff2 \|	blob \| history