diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2014-05-23 23:46:50 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2014-05-23 23:49:59 +0200 |
| commit | cce9e45cfcefb53d48fbb24fe4bbb7469cc1f272 (patch) | |
| tree | bdc0b3029809586526d3ce83bffb37c65db7fe70 /tools/perf/scripts/python | |
| parent | 40b0f135efdd185685ea9c84c5717224aaee72d1 (diff) | |
| parent | c690d80b82d96f32b8880a5d0b84a3d8509b17eb (diff) | |
Merge tag 'sunxi-dt-for-3.16-2' of https://github.com/mripard/linux into for-next
Merge "Allwinner DT changes for 3.16, take 2" from Maxime Ripard:
- Introduction of a new board, the i12-tvbox
- Enable the MMC and USB controllers on the Colombus
- Add the enable-method to the A31 cpus
- a few fixes
* tag 'sunxi-dt-for-3.16-2' of https://github.com/mripard/linux:
ARM: dts: sun7i: Add new i12-tvbox board
ARM: dts: sun7i: cubietruck: set mmc3 bus-width property
ARM: sun6i: Add MMC0 controller to the Colombus board
ARM: sun6i: Fix OHCI2 node name
ARM: sun6i: Enable USB Host support on the Colombus board
ARM: sunxi: Add fixed 3V regulator
ARM: sun6i: Define the A31 CPUs enable-method
ARM: sunxi: dt: build DTs according to new MACH_SUNxI Kconfig symbols
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Conflicts:
arch/arm/boot/dts/Makefile
Diffstat (limited to 'tools/perf/scripts/python')
0 files changed, 0 insertions, 0 deletions