diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-02-03 19:04:58 +0100 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-02-03 19:04:58 +0100 |
commit | d5bfb96bdad3588961f49a6eff89a625fbaa12bf (patch) | |
tree | 80e88fe85ea55785e2a5a2bdc1f9813ab3994153 /tools/perf/util/bpf-prologue.c | |
parent | Merge tag 'devicetree-fixes-for-4.5' of git://git.kernel.org/pub/scm/linux/ke... (diff) | |
parent | ipmi: put acpi.h with the other headers (diff) | |
download | linux-d5bfb96bdad3588961f49a6eff89a625fbaa12bf.tar.xz linux-d5bfb96bdad3588961f49a6eff89a625fbaa12bf.zip |
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 'tools/perf/util/bpf-prologue.c')
0 files changed, 0 insertions, 0 deletions