mirror of https://github.com/torvalds/linux.git
Conflicts: arch/arm/boot/dts/imx6sx-sdb.dts net/sched/cls_bpf.c Two simple sets of overlapping changes. Signed-off-by: David S. Miller <davem@davemloft.net> |
||
|---|---|---|
| .. | ||
| arm | ||
| clk | ||
| clock | ||
| dma | ||
| gpio | ||
| input | ||
| interrupt-controller | ||
| memory | ||
| mfd | ||
| phy | ||
| pinctrl | ||
| pwm | ||
| regulator | ||
| reset | ||
| reset-controller | ||
| soc | ||
| sound | ||
| spmi | ||
| thermal | ||