Conflicts were all overlapping changes. Signed-off-by: David S. Miller <davem@davemloft.net> |
||
|---|---|---|
| .. | ||
| arc | ||
| at91 | ||
| bcm2835 | ||
| brcmstb | ||
| fsl | ||
| imx | ||
| mediatek | ||
| mscc | ||
| nps | ||
| qcom | ||
| rockchip | ||
| sa1100 | ||
| sifive | ||
| tegra | ||
Conflicts were all overlapping changes. Signed-off-by: David S. Miller <davem@davemloft.net> |
||
|---|---|---|
| .. | ||
| arc | ||
| at91 | ||
| bcm2835 | ||
| brcmstb | ||
| fsl | ||
| imx | ||
| mediatek | ||
| mscc | ||
| nps | ||
| qcom | ||
| rockchip | ||
| sa1100 | ||
| sifive | ||
| tegra | ||