projects / cascardo / linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 140bd60 8190690)
Merge tag 'berlin-soc-3.19-2' of git://git.infradead.org/users/hesselba/linux-berlin...
authorArnd Bergmann <arnd@arndb.de>
Fri, 21 Nov 2014 11:59:18 +0000 (12:59 +0100)
committerArnd Bergmann <arnd@arndb.de>
Fri, 21 Nov 2014 11:59:18 +0000 (12:59 +0100)
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>

Trivial merge
Unnamed repository; edit this file 'description' to name the repository.