diff options
| author | Ingo Molnar <mingo@kernel.org> | 2016-10-16 18:17:05 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2016-10-17 10:46:09 +0200 |
| commit | 0e60439c22ec551e9b5780eba73ddfeb63ab63d9 (patch) | |
| tree | 642d77ae901612ef04eead2b583028c9ced76f5a /Documentation/isapnp.txt | |
| parent | ba2f81575eba8dcf128354169c20ae23f810f652 (diff) | |
| parent | f573bbc7a7773b8fc0d62be6b79345f5a971d97d (diff) | |
Merge branch 'mm/pkeys' into x86/urgent, to pick up pkeys fix
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'Documentation/isapnp.txt')
0 files changed, 0 insertions, 0 deletions