summaryrefslogtreecommitdiffstats
path: root/tools/power
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2015-06-07 15:35:27 +0200
committerIngo Molnar <mingo@kernel.org>2015-06-07 15:35:27 +0200
commitc2f9b0af8bb4b2a5c020ae88efc9a624f59a7080 (patch)
tree142041dd61132d487c2afddc8db32b350ee181ee /tools/power
parentc8e56d20f2d190d54c0615775dcb6a23c1091681 (diff)
parent243d657eaf540db882f73497060da5a4f7d86a90 (diff)
downloadop-kernel-dev-c2f9b0af8bb4b2a5c020ae88efc9a624f59a7080.zip
op-kernel-dev-c2f9b0af8bb4b2a5c020ae88efc9a624f59a7080.tar.gz
Merge branch 'x86/ras' into x86/core, to fix conflicts
Conflicts: arch/x86/include/asm/irq_vectors.h Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'tools/power')
0 files changed, 0 insertions, 0 deletions
OpenPOWER on IntegriCloud