From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 3 Feb 2016 18:04:58 +0000 (-0800)
Subject: Merge tag 'for-linus-4.5-2' of git://git.code.sf.net/p/openipmi/linux-ipmi
X-Git-Tag: v4.5-rc3~16
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d5bfb96bdad3588961f49a6eff89a625fbaa12bf;p=thirdparty%2Fkernel%2Flinux.git

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

Pull IPMI fix from Corey Minyard:
 "Fix a compile error on IPMI when ACPI is disabled"

* tag 'for-linus-4.5-2' of git://git.code.sf.net/p/openipmi/linux-ipmi:
  ipmi: put acpi.h with the other headers
---

d5bfb96bdad3588961f49a6eff89a625fbaa12bf