projects / linux-2.6-block.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 12e7b0a 9f0257b)
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)
commitf7813ad5cbfd1fab2899914281b72a1ba0805c80
treedd1eee88d9baedeb1a27bcae169eb4c5e9efae90tree | snapshot
parent12e7b0a62752234497de51356903f5f4e6bd2f77commit | diff
parent9f0257b39c138330fec96e0f8f1a0135c1f0b6a5commit | 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
Linux 6.x block layer and io_uring tree(s)