Merge branch 'linus' into core/generic-dma-coherent
authorIngo Molnar <mingo@elte.hu>
Fri, 18 Jul 2008 19:13:20 +0000 (21:13 +0200)
committerIngo Molnar <mingo@elte.hu>
Fri, 18 Jul 2008 19:13:20 +0000 (21:13 +0200)
Conflicts:

kernel/Makefile

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

Trivial merge