]> git.baikalelectronics.ru Git - kernel.git/commit
Merge tag 'for-linus-4.6' of git://git.code.sf.net/p/openipmi/linux-ipmi
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 18 Mar 2016 17:21:04 +0000 (10:21 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 18 Mar 2016 17:21:04 +0000 (10:21 -0700)
commitd2c127536031a1582fdf2cafaa3995691d3eae1b
treedd1eee88d9baedeb1a27bcae169eb4c5e9efae90
parentbb6c340968ebcea1b09646bff9925063458b281d
parent8af1fa17f0c3e2ec9bcce53279d2a05b7234ab3d
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