| commit | 739e4a758e0e2930f4bcdddd244254bae8dd7499 | [log] [tgz] |
|---|---|---|
| author | David S. Miller <davem@davemloft.net> | Thu Oct 02 11:25:43 2014 -0700 |
| committer | David S. Miller <davem@davemloft.net> | Thu Oct 02 11:25:43 2014 -0700 |
| tree | 0179d038669ad55591ae05a90b210d7090edf56e | |
| parent | d068b02cfdfc27f5962ec82ec5568b706f599edc [diff] | |
| parent | 50dddff3cb9af328dd42bafe3437c7f47e8b38a9 [diff] |
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>