Skip to content
  • Jiri Kosina's avatar
    Merge branch 'master' into for-next · e75d6606
    Jiri Kosina authored
    Merge with latest Linus' tree, as I have incoming patches
    that fix code that is newer than current HEAD of for-next.
    
    Conflicts:
    	drivers/net/ethernet/realtek/r8169.c
    e75d6606