| commit | 3f3558bb512e0762d5a4573a4aaf038d7a616e92 | [log] [tgz] |
|---|---|---|
| author | David S. Miller <davem@davemloft.net> | Thu Jan 15 00:53:17 2015 -0500 |
| committer | David S. Miller <davem@davemloft.net> | Thu Jan 15 00:53:17 2015 -0500 |
| tree | 1e2b43d410093e949209ca33614f5cdfdd16e80e | |
| parent | 9a6b4b392de4569e83ecfd6f382f3369f250b52f [diff] | |
| parent | a6391a924cf5a16761ccd6b45094a7d5b9aeebac [diff] |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net Conflicts: drivers/net/xen-netfront.c Minor overlapping changes in xen-netfront.c, mostly to do with some buffer management changes alongside the split of stats into TX and RX. Signed-off-by: David S. Miller <davem@davemloft.net>