]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
projects / karo-tx-linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4b660a7 e3ec0a8)
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)
Merge a fix from Philipp Zabel:

This patch fixes an erroneous revert that slipped in with commit
b424080a9e086e683ad5fdc624a7cf3c024e0c0f 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>

Trivial merge
Linux kernel for KaRo TX COM modules