git.openwrt.org Git - openwrt/staging/blogic.git/commit

projects / openwrt / staging / blogic.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 95dc192 66e56cd)

author	David S. Miller <davem@davemloft.net>
	Tue, 10 Dec 2013 01:20:14 +0000 (20:20 -0500)
committer	David S. Miller <davem@davemloft.net>
	Tue, 10 Dec 2013 01:20:14 +0000 (20:20 -0500)
commit	34f9f437104b86f6ddfa2770e2cd852846385dc3
tree	6c78386b3db9dd47fd2b79efb4dcf8c1472de99e	tree \| snapshot
parent	95dc19299f741c986227ec33e23cbf9b3321f812	commit \| diff
parent	66e56cd46b93ef407c60adcac62cf33b06119d50	commit \| diff

Merge git://git./linux/kernel/git/davem/net

Merge 'net' into 'net-next' to get the AF_PACKET bug fix that
Daniel's direct transmit changes depend upon.

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

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
drivers/net/bonding/bond_sysfs.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/nvidia/forcedeth.c	diff1 \|	diff2 \|	blob \| history
drivers/net/macvtap.c	diff1 \|	diff2 \|	blob \| history
drivers/net/tun.c	diff1 \|	diff2 \|	blob \| history
drivers/net/virtio_net.c	diff1 \|	diff2 \|	blob \| history
net/packet/af_packet.c	diff1 \|	diff2 \|	blob \| history
net/sched/act_skbedit.c	diff1 \|	diff2 \|	blob \| history
net/sctp/transport.c	diff1 \|	diff2 \|	blob \| history

John Crispins staging tree