diff options
| author | Kevin Hilman <khilman@linaro.org> | 2014-01-14 16:16:51 -0800 |
|---|---|---|
| committer | Kevin Hilman <khilman@linaro.org> | 2014-01-14 16:17:01 -0800 |
| commit | 69f8fa9bfdf93810c5d29fe36e31018a136c37c2 (patch) | |
| tree | 06b694db55b3e4dc5711489622d522c5b7f6d896 /net/unix/sysctl_net_unix.c | |
| parent | 9ebde306cf482cde18669dd5592665376fb59aef (diff) | |
| parent | 6267355f0e513bed9a5009924abc7a1e7de22ab3 (diff) | |
Merge tag 'sunxi-dt-for-3.14-2' of https://github.com/mripard/linux into next/dt
From Maxime Ripard:
Second round of DT additions for 3.14
Mostly:
- Addition of the missing PLLs and module clocks
- Addition of the external clocks
- Addition of the touchscreen controler
- I2C nodes of the Cubietruck
* tag 'sunxi-dt-for-3.14-2' of https://github.com/mripard/linux:
arm: sun7i: cubietruck: Enable the i2c controllers
ARM: dts: sun7i: external clock outputs
ARM: dts: sun7i: Change 32768 Hz oscillator node name to clk@N style
ARM: dts: sun7i: Add pin muxing options for clock outputs
ARM: dts: sun7i: Add rtp controller node
ARM: dts: sun5i: Add rtp controller node
ARM: dts: sun4i: Add rtp controller node
ARM: sun4i: dt: Remove chosen nodes
ARM: sun4i: dt: Move the aliases to the DTSI
ARM: sunxi: dt: add nodes for the mbus clock
ARM: sun7i: dt: mod0 clocks
ARM: sun5i: dt: mod0 clocks
ARM: sun4i: dt: mod0 clocks
ARM: sunxi: add PLL5 and PLL6 support
ARM: sunxi: add PLL4 support
Signed-off-by: Kevin Hilman <khilman@linaro.org>
Diffstat (limited to 'net/unix/sysctl_net_unix.c')
0 files changed, 0 insertions, 0 deletions