drtracing.org Git - deliverable/linux.git/commit

projects / deliverable / linux.git / commit

author	David S. Miller <davem@davemloft.net>
	Thu, 24 Apr 2014 17:19:00 +0000 (13:19 -0400)
committer	David S. Miller <davem@davemloft.net>
	Thu, 24 Apr 2014 17:19:00 +0000 (13:19 -0400)
commit	4366004d77278a90c18f92f7cb9ec0c264da563d
tree	4fb046b6b06cc681f791a8ddf7507b5f8eb99be8	tree \| snapshot
parent	e9f0fb88493570200b8dc1cc02d3e676412d25bc	commit \| diff
parent	a450a685791d12c0a477b75d630d6ae66acab9a7	commit \| diff

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

Conflicts:
drivers/net/ethernet/intel/igb/e1000_mac.c
net/core/filter.c

Both conflicts were simple overlapping changes.

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

Linux kernel - Deliverables

RSS Atom

This page took 0.030451 seconds and 5 git commands to generate.

drivers/net/ethernet/intel/e1000e/netdev.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/intel/i40e/i40e_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/intel/igb/e1000_mac.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/intel/igb/igb_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/intel/ixgbe/ixgbe.h	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/intel/ixgbe/ixgbe_common.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/intel/ixgbe/ixgbe_main.c	diff1 \|	diff2 \|	blob \| history
net/core/filter.c	diff1 \|	diff2 \|	blob \| history