diff options
author | David S. Miller <davem@davemloft.net> | 2014-10-02 20:25:43 +0200 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2014-10-02 20:25:43 +0200 |
commit | 739e4a758e0e2930f4bcdddd244254bae8dd7499 (patch) | |
tree | 0179d038669ad55591ae05a90b210d7090edf56e /security | |
parent | net: phy: add BCM7425 and BCM7429 PHYs (diff) | |
parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (diff) | |
download | linux-739e4a758e0e2930f4bcdddd244254bae8dd7499.tar.xz linux-739e4a758e0e2930f4bcdddd244254bae8dd7499.zip |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
drivers/net/usb/r8152.c
net/netfilter/nfnetlink.c
Both r8152 and nfnetlink conflicts were simple overlapping changes.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'security')
0 files changed, 0 insertions, 0 deletions