diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-03-18 18:21:04 +0100 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-03-18 18:21:04 +0100 |
commit | f7813ad5cbfd1fab2899914281b72a1ba0805c80 (patch) | |
tree | dd1eee88d9baedeb1a27bcae169eb4c5e9efae90 /kernel/workqueue.c | |
parent | Merge tag 'mfd-for-linus-4.6' of git://git.kernel.org/pub/scm/linux/kernel/gi... (diff) | |
parent | ipmi: do not probe ACPI devices if si_tryacpi is unset (diff) | |
download | linux-f7813ad5cbfd1fab2899914281b72a1ba0805c80.tar.xz linux-f7813ad5cbfd1fab2899914281b72a1ba0805c80.zip |
Merge tag 'for-linus-4.6' of git://git.code.sf.net/p/openipmi/linux-ipmi
Pull IPMI updates from Corey Minyard:
"Just some minor fixes, nothing big"
* tag 'for-linus-4.6' of git://git.code.sf.net/p/openipmi/linux-ipmi:
ipmi: do not probe ACPI devices if si_tryacpi is unset
ipmi_si: Avoid a wrong long timeout on transaction done
ipmi_si: Fix module parameter doc names
ipmi_ssif: Fix logic around alert handling
Diffstat (limited to 'kernel/workqueue.c')
0 files changed, 0 insertions, 0 deletions