]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commit
Merge tag 'for-linus-4.5-2' of git://git.code.sf.net/p/openipmi/linux-ipmi
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 3 Feb 2016 18:04:58 +0000 (10:04 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 3 Feb 2016 18:04:58 +0000 (10:04 -0800)
commitd5bfb96bdad3588961f49a6eff89a625fbaa12bf
tree80e88fe85ea55785e2a5a2bdc1f9813ab3994153
parent86270c8d7b1e98cd0f1dc107446461c050149b67
parent58c9d61f86e86ebe1e45ac7a0cd89a2c6299b034
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