| author | Felipe Balbi <balbi@ti.com> | |
| Fri, 26 Apr 2013 08:11:34 +0000 (11:11 +0300) | ||
| committer | Felipe Balbi <balbi@ti.com> | |
| Fri, 26 Apr 2013 08:12:43 +0000 (11:12 +0300) | ||
| commit | d6199907104a66b2a611fd39fc0dc2ba6ed77366 | |
| tree | c92ebd1d5b539f5ccf24e63e4beb63143c222c52 | tree | snapshot (tar.xz tar.gz zip) |
| parent | 83d0a5f15a5705f8d5618c693a3048d3bad57ad9 | commit | diff |
| parent | 4fb5e6ed22a83d79710852613bc90cce22d2706d | commit | diff |
Merge branch 'led_enablement' of git://gitorious.ti.com/ti-linux-kernel/ti-linux-feature-trees into connectivity-linux-3.8.y
* 'led_enablement' of git://gitorious.ti.com/ti-linux-kernel/ti-linux-feature-trees:
ARM: OMAP2+: AM33XX: omap2plus_defconfig: Add support for few drivers
ARM: dts: omap5-uevm: Add LED support for uEVM blue LED
ARM: dts: omap4-panda: Fix LED support for panda and pandaes
TI-Integration: ARM:dts:omap4-panda-common: Add back integrated content for USB
Signed-off-by: Felipe Balbi <balbi@ti.com>
Conflicts:
arch/arm/boot/dts/omap4-panda-common.dtsi
arch/arm/boot/dts/omap4-panda.dts
arch/arm/configs/omap2plus_defconfig
* 'led_enablement' of git://gitorious.ti.com/ti-linux-kernel/ti-linux-feature-trees:
ARM: OMAP2+: AM33XX: omap2plus_defconfig: Add support for few drivers
ARM: dts: omap5-uevm: Add LED support for uEVM blue LED
ARM: dts: omap4-panda: Fix LED support for panda and pandaes
TI-Integration: ARM:dts:omap4-panda-common: Add back integrated content for USB
Signed-off-by: Felipe Balbi <balbi@ti.com>
Conflicts:
arch/arm/boot/dts/omap4-panda-common.dtsi
arch/arm/boot/dts/omap4-panda.dts
arch/arm/configs/omap2plus_defconfig