diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2014-12-04 16:57:36 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2014-12-04 16:57:36 +0100 |
| commit | a8afa2645ccf3525409c749c1dc4ec1cf95ff3f5 (patch) | |
| tree | 0148315475b348246201f4d57b7ed5802f76cfb2 /include/video/w100fb.h | |
| parent | 136a713d80476fe993284bdf8b21709c179c9965 (diff) | |
| parent | f200890f224d9ed0af207145a2279f51c6be230b (diff) | |
| download | blackbird-op-linux-a8afa2645ccf3525409c749c1dc4ec1cf95ff3f5.tar.gz blackbird-op-linux-a8afa2645ccf3525409c749c1dc4ec1cf95ff3f5.zip | |
Merge tag 'reset-for-3.19-2' of git://git.pengutronix.de/git/pza/linux into next/drivers
Pull "Reset controller changes for v3.19" from Philipp Zabel:
This adds a new driver for the sti soc family, and creates
a reset_control_status interface, which is added to the existing
drivers.
* tag 'reset-for-3.19-2' of git://git.pengutronix.de/git/pza/linux:
reset: add socfpga_reset_status
reset: sti: Document sti-picophyreset controllers bindings.
reset: stih407: Add softreset, powerdown and picophy controllers
reset: stih407: Add reset controllers DT bindings
reset: add reset_control_status helper function
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'include/video/w100fb.h')
0 files changed, 0 insertions, 0 deletions
