git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ce22bb6 17e84a9)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
authorDavid S. Miller <davem@davemloft.net>
Mon, 31 Mar 2014 20:56:43 +0000 (16:56 -0400)
committerDavid S. Miller <davem@davemloft.net>
Mon, 31 Mar 2014 20:56:43 +0000 (16:56 -0400)
Conflicts:
drivers/net/xen-netback/netback.c

A bug fix overlapped with changing how the netback SKB control
block is implemented.

Signed-off-by: David S. Miller <davem@davemloft.net>

Trivial merge
Pandora Kernel Repository