Merge branch 'p-ti-linux-3.14.y-common/audio-for-next' of git://git.ti.com/android...
authorPraneeth Bajjuri <praneeth@ti.com>
Thu, 23 Jul 2015 18:41:39 +0000 (13:41 -0500)
committerPraneeth Bajjuri <praneeth@ti.com>
Thu, 23 Jul 2015 18:41:39 +0000 (13:41 -0500)
* 'p-ti-linux-3.14.y-common/audio-for-next' of git://git.ti.com/android-sdk/kernel-audio:
  ARM: dts: DRA7: Fix tlv320aic3106 i2c address

Change-Id: I2ecde01de076b517146395574f066a14dbd5dbb9
Signed-off-by: Praneeth Bajjuri <praneeth@ti.com>

Trivial merge