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)
commit4749edf82fac0a370fadb9ba9fdb14f5626056a7
tree7ca7db2a6ec217bbbcedd1e3cca21aa5c5494898
parenta436848cc73ba584034b44d326df1ff697904331
parent5bcd927233d18fbfabed461b31b0118147648525
Merge tag 'davinci-for-v4.5/fixes' of git://git./linux/kernel/git/nsekhar/linux-davinci into next/fixes-non-critical

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>