]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit6ea30c83d9777b4ec39b675ec726887a3369bc01
tree61902c09bfa14034a82c151f46a4616a2f013653
parentec7e551a307140f2c7ebdd4a304a51cfcaccf0c3
parent877b1484ded6cb946af8afa67331ca6062056bb3
Merge git://git.kernel.org/pub/scm/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
drivers/net/xen-netback/netback.c