]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit9e3e93a6001b97cc1e08ffcfcaa39bc62f91a997
tree84bf76e238c190b56089f3808ccc753f604d162b
parent7a701d4ec3fcee0c9ec4819d8379bf7cbea3c9c2
parentc3177e43e2058242268c153ee9f0939528dea898
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>