Skip to content
Snippets Groups Projects
Commit e5f2ef7a authored by David S. Miller's avatar David S. Miller
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net


Conflicts:
	drivers/net/ethernet/intel/e1000e/netdev.c

Minor conflict in e1000e, a line that got fixed in 'net'
has been removed in 'net-next'.

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 30129cf2 3da889b6
No related branches found
No related tags found
Showing
with 168 additions and 30 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment