Conflicts were simple overlapping changes in microchip driver. Signed-off-by: David S. Miller <davem@davemloft.net> |
||
---|---|---|
.. | ||
asm | ||
asm-generic | ||
linux | ||
tools | ||
trace/events | ||
uapi |
Conflicts were simple overlapping changes in microchip driver. Signed-off-by: David S. Miller <davem@davemloft.net> |
||
---|---|---|
.. | ||
asm | ||
asm-generic | ||
linux | ||
tools | ||
trace/events | ||
uapi |