summaryrefslogtreecommitdiff
path: root/kernel
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2016-02-03 10:04:58 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2016-02-03 10:04:58 -0800
commitd5bfb96bdad3588961f49a6eff89a625fbaa12bf (patch)
tree80e88fe85ea55785e2a5a2bdc1f9813ab3994153 /kernel
parent86270c8d7b1e98cd0f1dc107446461c050149b67 (diff)
parent58c9d61f86e86ebe1e45ac7a0cd89a2c6299b034 (diff)
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
Diffstat (limited to 'kernel')
0 files changed, 0 insertions, 0 deletions