diff options
| author | David S. Miller | 2012-02-27 03:55:51 +0100 |
|---|---|---|
| committer | David S. Miller | 2012-02-27 03:55:51 +0100 |
| commit | ff4783ce78c08d2990126ce1874250ae8e72bbd2 (patch) | |
| tree | 5c95885a4ab768101dd72942b57c238d452a7565 /drivers/isdn/gigaset/interface.c | |
| parent | mlx4_en: dont change mac_header on xmit (diff) | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (diff) | |
| download | kernel-qcow2-linux-ff4783ce78c08d2990126ce1874250ae8e72bbd2.tar.gz kernel-qcow2-linux-ff4783ce78c08d2990126ce1874250ae8e72bbd2.tar.xz kernel-qcow2-linux-ff4783ce78c08d2990126ce1874250ae8e72bbd2.zip | |
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>
Diffstat (limited to 'drivers/isdn/gigaset/interface.c')
0 files changed, 0 insertions, 0 deletions