| commit | ff4783ce78c08d2990126ce1874250ae8e72bbd2 | [log] [tgz] |
|---|---|---|
| author | David S. Miller <davem@davemloft.net> | Sun Feb 26 21:55:51 2012 -0500 |
| committer | David S. Miller <davem@davemloft.net> | Sun Feb 26 21:55:51 2012 -0500 |
| tree | 5c95885a4ab768101dd72942b57c238d452a7565 | |
| parent | 622121719934f60378279eb440d3cec2fc3176d2 [diff] | |
| parent | 203738e548cefc3fc3c2f73a9063176c9f3583d5 [diff] |
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>