From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 18 Mar 2016 17:21:04 +0000 (-0700)
Subject: Merge tag 'for-linus-4.6' of git://git.code.sf.net/p/openipmi/linux-ipmi
X-Git-Tag: v4.6-rc1~99
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f7813ad5cbfd1fab2899914281b72a1ba0805c80;p=thirdparty%2Fkernel%2Flinux.git

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
---

f7813ad5cbfd1fab2899914281b72a1ba0805c80