Merge tag 'davinci-fixes-for-v3.13-rc3' of git://git.kernel.org/pub/scm/linux/kernel...

From Sekhar Nori:
This pull request includes a patch
to align platform code to driver's
usage of platform_get_resource_byname()

This is needed to start successfully probing
audio again. The regression was introduced
in v3.13 merge window.

* tag 'davinci-fixes-for-v3.13-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci:
  ARM: davinci: Fix McASP mem resource names

Signed-off-by: Olof Johansson <olof@lixom.net>

diff --cc arch/arm/mach-davinci/dm355.c
Simple merge

diff --cc arch/arm/mach-davinci/dm365.c
Simple merge

diff --cc arch/arm/mach-davinci/dm644x.c
Simple merge

diff --cc arch/arm/mach-davinci/dm646x.c
Simple merge