diff options
| author | Ingo Molnar <mingo@kernel.org> | 2015-06-22 10:15:03 +0300 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2015-06-22 10:15:03 +0300 |
| commit | 7ef3d7d58d9dc73ee3d4f8f56d0024c8cca8163f (patch) | |
| tree | 2e81eab742ade60de5bafde16bb4181f7af63ac3 /fs/ocfs2/ocfs2.h | |
| parent | cb17b2a674f2059343f997599b4b001e64eec516 (diff) | |
| parent | 539f5113650068ba221197f190267ab727296ef5 (diff) | |
| parent | 7ea402d01cb68224972dde3ae68bd41131b1c3a1 (diff) | |
| parent | b58d930750135d6c5b8e5aa084c0e9303c78c286 (diff) | |
| download | linux-7ef3d7d58d9dc73ee3d4f8f56d0024c8cca8163f.tar.xz | |
Merge branches 'x86/apic', 'x86/asm', 'x86/mm' and 'x86/platform' into x86/core, to merge last updates
Signed-off-by: Ingo Molnar <mingo@kernel.org>