git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 46cfd6e 0dcceab)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
authorDavid S. Miller <davem@davemloft.net>
Thu, 5 Jun 2014 23:22:02 +0000 (16:22 -0700)
committerDavid S. Miller <davem@davemloft.net>
Thu, 5 Jun 2014 23:22:02 +0000 (16:22 -0700)
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>

Trivial merge
Pandora Kernel Repository