projects / profile / ivi / kernel-x86-ivi.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 41c5d02 a58b646)
Merge branch 'audio-display-ti-linux-3.14.y' of git://git.ti.com/~darrene/ti-linux...
authorTexas Instruments Auto Merger <lcpd_integration@list.ti.com>
Fri, 9 Jan 2015 18:26:15 +0000 (12:26 -0600)
committerTexas Instruments Auto Merger <lcpd_integration@list.ti.com>
Fri, 9 Jan 2015 18:26:15 +0000 (12:26 -0600)
TI-Feature: audio-display
TI-Tree: git://git.ti.com/~darrene/ti-linux-kernel/audio-display-linux-feature-tree.git
TI-Branch: audio-display-ti-linux-3.14.y

* 'audio-display-ti-linux-3.14.y' of git://git.ti.com/~darrene/ti-linux-kernel/audio-display-linux-feature-tree:
  media: ti-vpe: vip: Update regmap write for SMA_SW1
  arm: dts: dra7: Add syscon for smasw in VIP nodes

Signed-off-by: Texas Instruments Auto Merger <lcpd_integration@list.ti.com>
1  2 
arch/arm/boot/dts/dra7.dtsi patch | diff1 | diff2 | blob | history

diff --cc arch/arm/boot/dts/dra7.dtsi
Simple merge
Domain: System / Uncategorized;