Skip to content
Snippets Groups Projects
user avatar
David S. Miller authored
Resolved logic conflicts causing a build failure due to
drivers/net/r8169.c changes using a patch from Stephen Rothwell.

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
2bd93d7a