]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 9111474 5f20594)
Merge branch 'reset/fixes' of git://git.pengutronix.de/git/pza/linux into next/fixes...
authorOlof Johansson <olof@lixom.net>
Mon, 26 May 2014 19:16:17 +0000 (12:16 -0700)
committerOlof Johansson <olof@lixom.net>
Mon, 26 May 2014 19:16:17 +0000 (12:16 -0700)
commitb61a1a2b06137f97fa16803f0878b20d24caf377
tree526838ffc6d711a7ceaea5509a171b07c332b640tree | snapshot
parent9111474d1a8872430728d0b3391f839572c0b619commit | diff
parent5f20594c1cf27521e7b6b462bc630b5a3ca6e99acommit | diff
Merge branch 'reset/fixes' of git://git.pengutronix.de/git/pza/linux into next/fixes-non-critical

Merge a fix from Philipp Zabel:

This patch fixes an erroneous revert that slipped in with commit
3d496af6082ab5fccdaab9e354a82730bc388e33 reset: Add optional resets and
stubs.

* 'reset/fixes' of git://git.pengutronix.de/git/pza/linux:
  reset: Add of_reset_control_get to reset.h

Signed-off-by: Olof Johansson <olof@lixom.net>
Linux Kernel Source Tree.