| commit | 85dcce7a73f1cc59f7a96fe52713b1630f4ca272 | [log] [tgz] |
|---|---|---|
| author | David S. Miller <davem@davemloft.net> | Fri Mar 14 22:31:55 2014 -0400 |
| committer | David S. Miller <davem@davemloft.net> | Fri Mar 14 22:31:55 2014 -0400 |
| tree | 6c645923eb2f0152073b90685ce80e46cfb7afed | |
| parent | 4c4e4113db249c828fffb286bc95ffb255e081f5 [diff] | |
| parent | a4ecdf82f8ea49f7d3a072121dcbd0bf3a7cb93a [diff] |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net Conflicts: drivers/net/usb/r8152.c drivers/net/xen-netback/netback.c Both the r8152 and netback conflicts were simple overlapping changes. Signed-off-by: David S. Miller <davem@davemloft.net>