author | Praneeth Bajjuri <praneeth@ti.com> | |
Thu, 21 May 2015 19:19:11 +0000 (14:19 -0500) | ||
committer | Praneeth Bajjuri <praneeth@ti.com> | |
Thu, 21 May 2015 19:19:11 +0000 (14:19 -0500) | ||
commit | 97b51e84bac1a5d770982e95ca661eb6177669da | |
tree | d46de27f5eb9b2bb7b3f97c9f04dcee042683202 | tree | snapshot (tar.xz tar.gz zip) |
parent | 5d0d0e28ab28a8e5c3e69c6e2c90f452beaad69a | commit | diff |
parent | 05ce0576689757238d0b4e9c7b96a60bf290a12f | commit | diff |
Merge branch 'p-ti-linux-3.14.y-common/audio-for-next' of git://git.ti.com/android-sdk/kernel-audio into p-ti-linux-3.14.y-common
* 'p-ti-linux-3.14.y-common/audio-for-next' of git://git.ti.com/android-sdk/kernel-audio:
ARM: dtsi: dra7xx-jamr3: McASP2 is shared with DSP
ARM: dts: dra72-evm: TEMP: Add pinmux for radio
ARM: dts: dra72-evm: TEMP: Add pinmux for UART3
Change-Id: I5a700c1fe78ac6e730ebf1f07dd8265322ee46c2
Signed-off-by: Praneeth Bajjuri <praneeth@ti.com>
* 'p-ti-linux-3.14.y-common/audio-for-next' of git://git.ti.com/android-sdk/kernel-audio:
ARM: dtsi: dra7xx-jamr3: McASP2 is shared with DSP
ARM: dts: dra72-evm: TEMP: Add pinmux for radio
ARM: dts: dra72-evm: TEMP: Add pinmux for UART3
Change-Id: I5a700c1fe78ac6e730ebf1f07dd8265322ee46c2
Signed-off-by: Praneeth Bajjuri <praneeth@ti.com>