diff options
| author |   David S. Miller <davem@davemloft.net> | 2014-06-11 16:02:55 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-06-11 16:02:55 -0700 |
| commit | 902455e00720018d1dbd38327c3fd5bda6d844ee (patch) | |
| tree | 02fc906c5bc318220ad4827c6eac2521b9d1fbbf /net/sctp/associola.c | |
| parent | net/fsl: xgmac_mdio is dependent on OF_MDIO (diff) | |
| parent | net/core: Add VF link state control policy (diff) | |
| download | linux-dev-902455e00720018d1dbd38327c3fd5bda6d844ee.tar.xz linux-dev-902455e00720018d1dbd38327c3fd5bda6d844ee.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
net/core/rtnetlink.c
net/core/skbuff.c
Both conflicts were very simple overlapping changes.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/sctp/associola.c')
0 files changed, 0 insertions, 0 deletions