Honestly all the conflicts were simple overlapping changes, nothing really interesting to report. Signed-off-by: David S. Miller <davem@davemloft.net> |
||
|---|---|---|
| .. | ||
| asm | ||
| asm-generic | ||
| drm | ||
| linux | ||
| sound | ||
Honestly all the conflicts were simple overlapping changes, nothing really interesting to report. Signed-off-by: David S. Miller <davem@davemloft.net> |
||
|---|---|---|
| .. | ||
| asm | ||
| asm-generic | ||
| drm | ||
| linux | ||
| sound | ||