diff options
| author | Bjorn Andersson <bjorn.andersson@linaro.org> | 2016-11-18 08:13:56 -0800 |
|---|---|---|
| committer | Bjorn Andersson <bjorn.andersson@linaro.org> | 2016-11-18 08:13:56 -0800 |
| commit | 1a494c20d14c725747eb8f039196447e2c366ab6 (patch) | |
| tree | 48ea94fc09785448f1b9f0e8861ae94c8d5d09e2 /drivers/watchdog/lpc18xx_wdt.c | |
| parent | f33a73586f4d9f23e2cbb4d978b97dc54dcdfb95 (diff) | |
| parent | 3d6b3715fb5d4b7321a9ebd664991be2ed8f5f7b (diff) | |
| download | linux-1a494c20d14c725747eb8f039196447e2c366ab6.tar.bz2 | |
Merge branch 'topic/st_fdma' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/slave-dma into rproc-next
* 'topic/st_fdma' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/slave-dma:
dmaengine: st_fdma: Revert: "Revert: Update st_fdma to 'depends on REMOTEPROC'"
Diffstat (limited to 'drivers/watchdog/lpc18xx_wdt.c')
0 files changed, 0 insertions, 0 deletions