tree 5c95885a4ab768101dd72942b57c238d452a7565
parent 622121719934f60378279eb440d3cec2fc3176d2
parent 203738e548cefc3fc3c2f73a9063176c9f3583d5
author David S. Miller <davem@davemloft.net> 1330311351 -0500
committer David S. Miller <davem@davemloft.net> 1330311351 -0500

Merge git://git.kernel.org/pub/scm/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>