diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-08-15 14:25:49 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-08-15 14:25:49 +0200 |
| commit | c1270363911365a764503b0ca3af6cbf85f5c325 (patch) | |
| tree | bd3ba1a95bf47f418e7bde589ef58a67e60be511 /arch/alpha/include | |
| parent | 0d7614f09c1ebdbaa1599a5aba7593f147bf96ee (diff) | |
| parent | 1d3266ecca67066e537fe0e0669bed77d355f886 (diff) | |
| download | blackbird-op-linux-c1270363911365a764503b0ca3af6cbf85f5c325.tar.gz blackbird-op-linux-c1270363911365a764503b0ca3af6cbf85f5c325.zip | |
Merge branch 'ux500-core' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson into next/soc
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>
Diffstat (limited to 'arch/alpha/include')
0 files changed, 0 insertions, 0 deletions
