diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2014-11-21 12:59:18 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2014-11-21 12:59:18 +0100 |
| commit | 00f879bed45148612e1065ac26e46a7a39e5c8d9 (patch) | |
| tree | 84bf76e238c190b56089f3808ccc753f604d162b /arch/arm/include/debug | |
| parent | 140bd60383309e82b5cae3294a907c11a0a12b90 (diff) | |
| parent | 81906906d8d95837c87b934a1a929cc43b61f4ee (diff) | |
Merge tag 'berlin-soc-3.19-2' of git://git.infradead.org/users/hesselba/linux-berlin into next/soc
Pull "Berlin SoC changes for v3.19 (round 2)" from Sebastian Hesselbarth:
- Do not select RESET_CONTROLLER as it is user selectable
* tag 'berlin-soc-3.19-2' of git://git.infradead.org/users/hesselba/linux-berlin:
ARM: berlin: do not select RESET_CONTROLLER
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/include/debug')
0 files changed, 0 insertions, 0 deletions