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 |
||
|---|---|---|
| .. | ||
| x86 | ||
| Kconfig | ||
| Makefile | ||
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 |
||
|---|---|---|
| .. | ||
| x86 | ||
| Kconfig | ||
| Makefile | ||