projects / GitHub / LineageOS / G12 / android_kernel_amlogic_linux-4.9.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(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)
commit0b70195e0c3206103be991e196c26fcf168d0334
tree61902c09bfa14034a82c151f46a4616a2f013653tree | snapshot (tar.gz zip)
parentce22bb6122e849e0d3a6857d03eb69a25bfdc6e9commit | diff
parent17e84a9253467552fb06f99c009bb0bc1d7bfd39commit | diff
Merge git://git./linux/kernel/git/davem/net

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>
drivers/net/ieee802154/at86rf230.c diff1 | diff2 | blob | history
drivers/net/xen-netback/netback.c diff1 | diff2 | blob | history