Skip to content
Commit bcd618e4 authored by Jeff Garzik's avatar Jeff Garzik
Browse files

Merge branch 'upstream-fixes' into upstream 

Conflicts:

	drivers/net/e1000/e1000_ethtool.c
parents ba9b28d1 cb15f81b
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment