Merge tag 'davinci-for-v4.5/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorOlof Johansson <olof@lixom.net>
Tue, 22 Dec 2015 19:40:17 +0000 (11:40 -0800)
committerOlof Johansson <olof@lixom.net>
Tue, 22 Dec 2015 19:40:17 +0000 (11:40 -0800)
This pull request includes a fix for improper usage of WARN() and a fix
for unmet 'select' dependencies.

* tag 'davinci-for-v4.5/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci:
  ARM: davinci: fix a problematic usage of WARN()
  ARM: davinci: only select WT cache if cache is enabled

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

Trivial merge