diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2014-03-27 01:28:19 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2014-03-27 01:28:19 +0100 |
| commit | 463e8474af8317c3bfc0dc95b0d003e11e847b40 (patch) | |
| tree | e83b8de6826d81e5f01f26cb486fbc82bb5e8169 /drivers/media | |
| parent | Revert "dts: socfpga: Add DTS entry for adding the stmmac glue layer for stmm... (diff) | |
| parent | reset: Add optional resets and stubs (diff) | |
| download | linux-463e8474af8317c3bfc0dc95b0d003e11e847b40.tar.xz linux-463e8474af8317c3bfc0dc95b0d003e11e847b40.zip | |
Merge branch 'reset/for_v3.15' of git://git.pengutronix.de/git/pza/linux into next/drivers
Merge "reset controller fixes and updates" from Philipp Zabel:
* 'reset/for_v3.15' of git://git.pengutronix.de/git/pza/linux:
reset: Add optional resets and stubs
reset: Add of_reset_control_get
reset: Mark function as static and remove unused function in core.c
reset: allow drivers to request probe deferral
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'drivers/media')
0 files changed, 0 insertions, 0 deletions