Merge branch 'linus' into core/generic-dma-coherent
authorIngo Molnar <mingo@elte.hu>
Mon, 28 Jul 2008 22:07:55 +0000 (00:07 +0200)
committerIngo Molnar <mingo@elte.hu>
Mon, 28 Jul 2008 22:07:55 +0000 (00:07 +0200)
Conflicts:

arch/x86/Kconfig

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

Trivial merge