From: Arnd Bergmann Date: Wed, 15 Aug 2012 12:25:49 +0000 (+0200) Subject: Merge branch 'ux500-core' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw... X-Git-Tag: next-20120816~11^2~2^2 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=c1270363911365a764503b0ca3af6cbf85f5c325;p=karo-tx-linux.git Merge branch 'ux500-core' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson into next/soc Linus Walleij : 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 --- c1270363911365a764503b0ca3af6cbf85f5c325