diff options
| author | Ingo Molnar <mingo@kernel.org> | 2016-07-15 10:26:04 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2016-07-15 10:26:04 +0200 |
| commit | 38452af2424dc99854c78523d74b260fa8a984f0 (patch) | |
| tree | 0dc49c27e1a58a0b35c23db05d85d2e8571ea471 /include/linux/pda_power.h | |
| parent | dcb32d9913b7ed527b135a7e221f8d14b67bb952 (diff) | |
| parent | be8a18e2e98e04a5def5887d913b267865562448 (diff) | |
| download | op-kernel-dev-38452af2424dc99854c78523d74b260fa8a984f0.zip op-kernel-dev-38452af2424dc99854c78523d74b260fa8a984f0.tar.gz | |
Merge branch 'x86/asm' into x86/mm, to resolve conflicts
Conflicts:
tools/testing/selftests/x86/Makefile
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'include/linux/pda_power.h')
0 files changed, 0 insertions, 0 deletions
