]> 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)
commitb3422017ebfcce96e9edc7e6fd71199a69b35fbb
tree84bf76e238c190b56089f3808ccc753f604d162b
parentb9e808c4ef3d6d3a3395be9e5f0dc02e27148e19
parent5032748495f025dda292aeccf8ad7942c89faf61
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>