| commit | f666f87b9423fb534d2116206ace04495080f2b5 | [log] [tgz] |
|---|---|---|
| author | David S. Miller <davem@davemloft.net> | Thu Jun 05 16:22:02 2014 -0700 |
| committer | David S. Miller <davem@davemloft.net> | Thu Jun 05 16:22:02 2014 -0700 |
| tree | 23f929c890219d6ef412b4ff630adf501b70a3ec | |
| parent | 46cfd6ea23b0a207c87269d86457727dc4485708 [diff] | |
| parent | 0dcceabb0c1bf2d4c12a748df9933fad303072a7 [diff] |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net Conflicts: drivers/net/xen-netback/netback.c net/core/filter.c A filter bug fix overlapped some cleanups and a conversion over to some new insn generation macros. A xen-netback bug fix overlapped the addition of multi-queue support. Signed-off-by: David S. Miller <davem@davemloft.net>