From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 20 Nov 2015 02:14:47 +0000 (-0800)
Subject: Merge tag 'for-linus-4.4' of git://git.code.sf.net/p/openipmi/linux-ipmi
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=cd6caf550a2adc763c6301ecc0be01f422fb2aea;p=GitHub%2FLineageOS%2FG12%2Fandroid_kernel_amlogic_linux-4.9.git

Merge tag 'for-linus-4.4' of git://git.code.sf.net/p/openipmi/linux-ipmi

Pull IPMI updates from Corey Minyard:
 "Some fixes for small IPMI problems.

  The most significant is that the driver wasn't starting the timer for
  some messages, which would result in problems if that message failed
  for some reason.

  The others are small optimizations or making things a little neater"

* tag 'for-linus-4.4' of git://git.code.sf.net/p/openipmi/linux-ipmi:
  ipmi watchdog : add panic_wdt_timeout parameter
  char: ipmi: Move MODULE_DEVICE_TABLE() to follow struct
  ipmi: Stop the timer immediately if idle
  ipmi: Start the timer and thread on internal msgs
---

cd6caf550a2adc763c6301ecc0be01f422fb2aea