Commits

Merge branch 'linus' into core/generic-dma-coherent Conflicts: arch/x86/Kconfig Signed-off-by: Ingo Molnar <mingo@elte.hu>
Merge branch 'linus' into core/generic-dma-coherent Conflicts: arch/x86/Kconfig Signed-off-by: Ingo Molnar <mingo@elte.hu>