diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-03-02 12:45:46 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-03-02 12:45:46 -0800 |
| commit | 4f1f2b8f0818af9b0e21ba4b17ab615e29b4650d (patch) | |
| tree | 6df95b7627d544ff16c5bc09d4242f69f1482681 /scripts | |
| parent | 474c90156c8dcc2fa815e6716cc9394d7930cb9c (diff) | |
| parent | 9ad82f117f057ed04643cc60ce16fbf59e1b167f (diff) | |
Merge tag 'watchdog-for-linus-v4.11-2' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging
Pull more watchdog updates from Guenter Roeck:
- fix fallout from enabling COMPILE_TEST
- fix gcc-4.3 build of kempld watchdog driver
- use hrtimer in softdog
* tag 'watchdog-for-linus-v4.11-2' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging:
watchdog: retu: restore MFD dependency
watchdog: db8500: add back prmcu dependency
watchdog: kempld: fix gcc-4.3 build
watchdog: softdog: fire watchdog even if softirqs do not get to run
watchdog: kempld: revert to full dependency
watchdog: bcm2835: add CONFIG_OF dependency
watchdog: sp805: add back AMBA dependency
watchdog: menf21bmc: add I2C dependency
watchdog: geode: restore hard CS5535_MFGPT dependency
watchdog: wm831x watchdog really needs mfd
Diffstat (limited to 'scripts')
0 files changed, 0 insertions, 0 deletions