author | Dan Murphy <dmurphy@ti.com> | |
Mon, 15 Apr 2013 14:04:50 +0000 (09:04 -0500) | ||
committer | Dan Murphy <dmurphy@ti.com> | |
Mon, 15 Apr 2013 14:04:50 +0000 (09:04 -0500) | ||
commit | e09afb78fb68118473dc9fed05e707170ec3bd4a | |
tree | dcbfd624dbb49b802796ec4b3823ed2cd7ca3e5f | tree | snapshot (tar.xz tar.gz zip) |
parent | d9fd3534623ad41a8372736860df77acd5b30c34 | commit | diff |
parent | 9606a9ee8e7695541c684b90a6d9e7a25b9c3b79 | commit | diff |
Merge branch 'pm-linux-3.8.y' of git://git.ti.com/~kristo/ti-linux-kernel/pm-linux-feature-tree into ti-linux-3.8.y
TI-Feature: power_management
TI-Tree: git://git.ti.com/~kristo/ti-linux-kernel/pm-linux-feature-tree.git
TI-Branch: pm-linux-3.8.y
* 'pm-linux-3.8.y' of git://git.ti.com/~kristo/ti-linux-kernel/pm-linux-feature-tree:
ARM: DTS: OMAP5-uevm: pull-up Palmas MSECURE line
ARM/dts: omap5-sevm: Enable palmas on i2c1 bus
Conflicts:
arch/arm/boot/dts/omap5-sevm.dts
arch/arm/boot/dts/omap5-uevm.dts
Signed-off-by: Dan Murphy <dmurphy@ti.com>
TI-Feature: power_management
TI-Tree: git://git.ti.com/~kristo/ti-linux-kernel/pm-linux-feature-tree.git
TI-Branch: pm-linux-3.8.y
* 'pm-linux-3.8.y' of git://git.ti.com/~kristo/ti-linux-kernel/pm-linux-feature-tree:
ARM: DTS: OMAP5-uevm: pull-up Palmas MSECURE line
ARM/dts: omap5-sevm: Enable palmas on i2c1 bus
Conflicts:
arch/arm/boot/dts/omap5-sevm.dts
arch/arm/boot/dts/omap5-uevm.dts
Signed-off-by: Dan Murphy <dmurphy@ti.com>
arch/arm/boot/dts/omap5-sevm.dts | diff1 | | diff2 | | blob | history |
arch/arm/boot/dts/omap5-uevm.dts | diff1 | | diff2 | | blob | history |