Merge tag 'for-linus-4.15-2' of git://github.com/cminyard/linux-ipmi
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 12 Dec 2017 01:01:59 +0000 (17:01 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 12 Dec 2017 01:01:59 +0000 (17:01 -0800)
commitbfb529ee790f5c3b1efd892d48c0b8d1449849f4
tree9111ac725d453a036bf91ca0f9d307a62ac976f4
parent916b20e02e1579fcca139b04ccfe25d61594faa8
parent51614b26a029515dd3bc43a8c0e16a9ee51bbf52
Merge tag 'for-linus-4.15-2' of git://github.com/cminyard/linux-ipmi

Pull IPMI fixes from Corey Minyard.

* tag 'for-linus-4.15-2' of git://github.com/cminyard/linux-ipmi:
  ipmi_si: fix crash on parisc
  ipmi_si: Fix oops with PCI devices
  ipmi: Stop timers before cleaning up the module
drivers/char/ipmi/ipmi_si_intf.c