]> git.ipfire.org Git - thirdparty/kernel/stable.git/commit
projects / thirdparty / kernel / stable.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: e9f0fb8 a450a68)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
authorDavid S. Miller <davem@davemloft.net>
Thu, 24 Apr 2014 17:19:00 +0000 (13:19 -0400)
committerDavid S. Miller <davem@davemloft.net>
Thu, 24 Apr 2014 17:19:00 +0000 (13:19 -0400)
commit4366004d77278a90c18f92f7cb9ec0c264da563d
tree4fb046b6b06cc681f791a8ddf7507b5f8eb99be8tree | snapshot
parente9f0fb88493570200b8dc1cc02d3e676412d25bccommit | diff
parenta450a685791d12c0a477b75d630d6ae66acab9a7commit | diff
Merge git://git.kernel.org/pub/scm/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>
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
Mirror https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git