tree 316436f77dac75335fd2c3ef5f109e71606c50d3
parent b6d4f7e3ef25beb8c658c97867d98883e69dc544
parent f934fb19ef34730263e6afc01e8ec27a8a71470f
author Ingo Molnar <mingo@elte.hu> 1217282875 +0200
committer Ingo Molnar <mingo@elte.hu> 1217282875 +0200

Merge branch 'linus' into core/generic-dma-coherent

Conflicts:

	arch/x86/Kconfig

Signed-off-by: Ingo Molnar <mingo@elte.hu>