diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-03-18 20:21:04 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-03-18 20:21:04 +0300 |
| commit | f7813ad5cbfd1fab2899914281b72a1ba0805c80 (patch) | |
| tree | dd1eee88d9baedeb1a27bcae169eb4c5e9efae90 /kernel/sysctl.c | |
| parent | 12e7b0a62752234497de51356903f5f4e6bd2f77 (diff) | |
| parent | 9f0257b39c138330fec96e0f8f1a0135c1f0b6a5 (diff) | |
| download | linux-f7813ad5cbfd1fab2899914281b72a1ba0805c80.tar.xz | |
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/sysctl.c')
0 files changed, 0 insertions, 0 deletions