Merge tag 'for-linus-4.0-1' of git://git.code.sf.net/p/openipmi/linux-ipmi
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 11 Apr 2015 17:47:17 +0000 (10:47 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 11 Apr 2015 17:47:17 +0000 (10:47 -0700)
Pull late ipmi fixes from Corey Minyard:
 "Some annoying issues in the IPMI driver that would be good to have
  fixed before 4.0 is released.

  These got reported or discovered late, but they will avoid some
  situations that would cause lots of log spam and in one case a
  deadlock"

* tag 'for-linus-4.0-1' of git://git.code.sf.net/p/openipmi/linux-ipmi:
  ipmi_ssif: Use interruptible completion for waiting in the thread
  ipmi/powernv: Fix minor locking bug
  ipmi: Handle BMCs that don't allow clearing the rcv irq bit


Trivial merge