Forum | Documentation | Website | Blog

Skip to content
Snippets Groups Projects
Commit 1185c463 authored by Dan Murphy's avatar Dan Murphy
Browse files

Merge branch 'connectivity-ti-linux-3.14.y' of...

Merge branch 'connectivity-ti-linux-3.14.y' of git://git.ti.com/connectivity-integration-tree/connectivity-ti-linux-kernel into ti-linux-3.14.y

TI-Feature: connectivity
TI-Tree: git://git.ti.com/connectivity-integration-tree/connectivity-ti-linux-kernel.git
TI-Branch: connectivity-ti-linux-3.14.y

* 'connectivity-ti-linux-3.14.y' of git://git.ti.com/connectivity-integration-tree/connectivity-ti-linux-kernel

:
  serial: omap-serial : Fix pinctrl sleep conflict with wakeup
  ARM: dts: am57xx-beagle-x15: Add Palmas power button
  ARM: dts: am57xx-beagle-x15: Add dual ethernet

Signed-off-by: default avatarDan Murphy <DMurphy@ti.com>
parents 93057a75 985ee8d6
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment