diff options
| author | Vinod Koul <vinod.koul@intel.com> | 2016-10-03 05:47:33 +0200 |
|---|---|---|
| committer | Vinod Koul <vinod.koul@intel.com> | 2016-10-03 05:47:33 +0200 |
| commit | 11bfedff5594eef74617e6aa02986cf517526b98 (patch) | |
| tree | 2aa1a3b8d4e71abda7103b41edffb3a92ca26784 /drivers/watchdog/softdog.c | |
| parent | Merge branch 'topic/dmatest' into for-linus (diff) | |
| parent | dmaengine: qcom_hidma: add error reporting for tx_status (diff) | |
| download | linux-11bfedff5594eef74617e6aa02986cf517526b98.tar.xz linux-11bfedff5594eef74617e6aa02986cf517526b98.zip | |
Merge branch 'topic/err_reporting' into for-linus
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
Conflicts:
drivers/dma/cppi41.c
Diffstat (limited to 'drivers/watchdog/softdog.c')
0 files changed, 0 insertions, 0 deletions