diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2017-04-20 17:05:13 +0300 |
---|---|---|
committer | Thomas Gleixner <tglx@linutronix.de> | 2017-04-20 17:05:13 +0300 |
commit | 7a258ff04f9d5fe549fed6d03931a0236587047e (patch) | |
tree | 6b164332c2a3983d972cc4dc47af3fce6cc5dc32 /Documentation/lockup-watchdogs.txt | |
parent | 382bd4de61827dbaaf5fb4fb7b1f4be4a86505e7 (diff) | |
parent | f61143c45077df4fa78e2f1ba455a00bbe1d5b8c (diff) | |
download | linux-7a258ff04f9d5fe549fed6d03931a0236587047e.tar.xz |
Merge branch 'linus' into irq/core
Pick up upstream fixes to avoid conflicts with pending patches.
Diffstat (limited to 'Documentation/lockup-watchdogs.txt')
0 files changed, 0 insertions, 0 deletions