diff options
| author | David S. Miller | 2014-11-01 19:53:27 +0100 |
|---|---|---|
| committer | David S. Miller | 2014-11-01 19:53:27 +0100 |
| commit | 55b42b5ca2dcf143465968697fe6c6503b05fca1 (patch) | |
| tree | 91878cd53efc44ba67244d4d3897020828c87c01 /kernel/sys_ni.c | |
| parent | drivers: net: cpsw: Support ALLMULTI and fix IFF_PROMISC in switch mode (diff) | |
| parent | sunhme: Add DMA mapping error checks. (diff) | |
| download | kernel-qcow2-linux-55b42b5ca2dcf143465968697fe6c6503b05fca1.tar.gz kernel-qcow2-linux-55b42b5ca2dcf143465968697fe6c6503b05fca1.tar.xz kernel-qcow2-linux-55b42b5ca2dcf143465968697fe6c6503b05fca1.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
drivers/net/phy/marvell.c
Simple overlapping changes in drivers/net/phy/marvell.c
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'kernel/sys_ni.c')
0 files changed, 0 insertions, 0 deletions