Merge tag 'davinci-fixes-for-v3.12-rc2-v2' of git://git.kernel.org/pub/scm/linux...
authorOlof Johansson <olof@lixom.net>
Fri, 20 Sep 2013 17:36:50 +0000 (10:36 -0700)
committerOlof Johansson <olof@lixom.net>
Fri, 20 Sep 2013 17:36:50 +0000 (10:36 -0700)
commit55a9e7c8a69158358f53fc94537f1076ad7fe322
treea492b68c498c50e8897a8976a10da020c68accc8
parentb44cf0226d82c807fd87a04e2fccb97f86cc3bf1
parent016b9eb0c52ed7349ffdb42b4e51c93ad1f5d90a
Merge tag 'davinci-fixes-for-v3.12-rc2-v2' of git://git./linux/kernel/git/nsekhar/linux-davinci into fixes

From Sekhar Nori, DaVinci fixes for v3.12-rc2:
- a fix build breakage with DEBUG_LL
- a quell a build-time warning

* tag 'davinci-fixes-for-v3.12-rc2-v2' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci:
  ARM: davinci: dm365 evm: fix unused variable warning
  ARM: davinci: fix build breakage with DEBUG_LL

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