| commit | f7813ad5cbfd1fab2899914281b72a1ba0805c80 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Fri Mar 18 10:21:04 2016 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Fri Mar 18 10:21:04 2016 -0700 |
| tree | dd1eee88d9baedeb1a27bcae169eb4c5e9efae90 | |
| parent | 12e7b0a62752234497de51356903f5f4e6bd2f77 [diff] | |
| parent | 9f0257b39c138330fec96e0f8f1a0135c1f0b6a5 [diff] |
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