Merge branch 'ux500-core' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw...

Linus Walleij <linus.walleij@linaro.org>:

This cleans up, updates and structure the use of some ASIC ID
detection macros so they are understandable and consistent.

* 'ux500-core' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson:
  ARM: ux500: add detection for DB8500 ASIC v2.2
  ARM: ux500: reform Ux500 family names
  ARM: ux500: add a U8520 detection macro
  ARM: ux500: delete remnant U5500 macros

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