diff options
| author | Andy Shevchenko <andriy.shevchenko@linux.intel.com> | 2020-04-24 13:56:46 +0300 |
|---|---|---|
| committer | Andy Shevchenko <andriy.shevchenko@linux.intel.com> | 2020-04-24 13:56:46 +0300 |
| commit | 4a65ed6562bcfa58fe0c2ca5855c45268f40d365 (patch) | |
| tree | 072de56917dc218b75a4796f4605428959ec0dc9 /drivers/watchdog/cadence_wdt.c | |
| parent | b5f7311d3a2ed153f26b21c56d54a46d07a4da3f (diff) | |
| parent | 2f72d35ea75ee8bf8c9e63fb43d43d5bfb4ac8fd (diff) | |
Merge branch 'ib-mfd-x86-usb-watchdog-v5.7'
Merge branch 'ib-mfd-x86-usb-watchdog-v5.7' of
git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git
to avoid conflicts in PDx86.
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Diffstat (limited to 'drivers/watchdog/cadence_wdt.c')
0 files changed, 0 insertions, 0 deletions