Merge branch 'vexpress-fixes' of git://git.linaro.org/people/pawelmoll/linux...

Merge branch 'vexpress-fixes' of git://git.linaro.org/people/pawelmoll/linux into next/fixes-non-critical

* 'vexpress-fixes' of git://git.linaro.org/people/pawelmoll/linux

:
  ARM: vexpress: Make the debug UART detection more specific

Signed-off-by: Arnd Bergmann <arnd@arndb.de>