diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2014-03-17 15:08:59 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2014-03-17 15:08:59 +0100 |
| commit | a38f8913da6bf30e7ef46f8d07b6344860bc4604 (patch) | |
| tree | 7d0032e035845e9f96e612716521176d5f84e148 /tools/perf/scripts/python/Perf-Trace-Util/Context.c | |
| parent | 542798cdd500614feba234ed602777eae33edbb8 (diff) | |
| parent | ca5d04d90825a3f3f2fc1aaba09953a55564e0e8 (diff) | |
Merge tag 'sunxi-dt-for-3.15-2' of https://github.com/mripard/linux into next/dt
Pull "Allwinner DT additions for 3.15, take 2" from Maxime Ripard:
- Two new boards: INet 97F Rev 02 and A10-OLinuXino-LIME
- Addition of the I2C for the A31
- Addition USB Host mode for the A10, A10s, A13 and A20
- Addition of SATA support for the A10 and A20
- Change of compatible for the watchdog
* tag 'sunxi-dt-for-3.15-2' of https://github.com/mripard/linux: (23 commits)
ARM: sunxi: dt: Update the watchdog compatibles
ARM: sun6i: colombus: Enable the I2C controllers
ARM: sun6i: Enable the I2C muxing options
ARM: sun6i: Enable the I2C controllers
ARM: sun4i: dt: Add support for the INet-97F_Rev_02 board
ARM: sun4i: dt: Add support for the A10-OLinuXino-LIME board
ARM: sun7i: dt: Add USB host nodes to a20-olinuxino-micro dts
ARM: sun7i: dt: Add USB host nodes to cubieboard2 dts
ARM: sun7i: dt: Add USB host nodes to cubietruck dts
ARM: sun5i: dt: Add USB host nodes to a13-olinuxino-micro
ARM: sun5i: dt: Add USB host nodes to a10s-olinuxino-micro
ARM: sun5i: dt: Add USB host nodes to A13-Olinuxino
ARM: sun4i: dt: Add USB host nodes to pcduino.dts
ARM: sun4i: dt: Add USB host nodes to mini-xplus dts
ARM: sun4i: dt: Add USB host nodes to hackberry dts
ARM: sun4i: dt: Add USB host nodes to cubieboard dts
ARM: sun4i: dt: Add USB host nodes to Mele A1000 dts
ARM: sun7i: dt: Add USB host bindings
ARM: sun5i: dt: Add USB host bindings
ARM: sun4i: dt: Add USB host bindings
...
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'tools/perf/scripts/python/Perf-Trace-Util/Context.c')
0 files changed, 0 insertions, 0 deletions