Merge tag 'davinci-fixes-for-v3.15-rc4' of git://git.kernel.org/pub/scm/linux/kernel...
authorOlof Johansson <olof@lixom.net>
Mon, 26 May 2014 21:55:53 +0000 (14:55 -0700)
committerOlof Johansson <olof@lixom.net>
Mon, 26 May 2014 21:55:53 +0000 (14:55 -0700)
commit7741fa197ccb4862403554e7829be727a8fa3ba0
treefee4e5f04eed6c0cc72ee2e0922137235b7af8d7
parent75d6bc5f7ab41a166deb6e9ebc8434706799fb00
parentcf7eb979116c2568e8bc3b6a7269c7a359864ace
Merge tag 'davinci-fixes-for-v3.15-rc4' of git://git./linux/kernel/git/nsekhar/linux-davinci into next/drivers

The patch fixes EDMA crossbar mapping to actually
make it work. The patch has been tagged for stable.

* tag 'davinci-fixes-for-v3.15-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci:
  ARM: common: edma: Fix xbar mapping
arch/arm/boot/dts/am33xx.dtsi