diff options
| author | Ingo Molnar <[email protected]> | 2017-11-07 09:51:10 +0000 |
|---|---|---|
| committer | Ingo Molnar <[email protected]> | 2017-11-07 09:51:10 +0000 |
| commit | 141d3b1daacd11bdbd6fa74c2b163093e10d17ee (patch) | |
| tree | 04c98496f16ad2fe34c0cf4f31fedf4fe558c017 /fs/jbd2/commit.c | |
| parent | x86/vector/msi: Select CONFIG_GENERIC_IRQ_RESERVATION_MODE (diff) | |
| parent | Merge branch 'for-4.14-fixes' of git://git.kernel.org/pub/scm/linux/kernel/gi... (diff) | |
| download | kernel-141d3b1daacd11bdbd6fa74c2b163093e10d17ee.tar.gz kernel-141d3b1daacd11bdbd6fa74c2b163093e10d17ee.zip | |
Merge branch 'linus' into x86/apic, to resolve conflicts
Conflicts:
arch/x86/include/asm/x2apic.h
Signed-off-by: Ingo Molnar <[email protected]>
Diffstat (limited to 'fs/jbd2/commit.c')
0 files changed, 0 insertions, 0 deletions