Merge commit 'v2.6.27-rc3' into x86/prototypes
authorIngo Molnar <mingo@elte.hu>
Thu, 14 Aug 2008 10:19:59 +0000 (12:19 +0200)
committerIngo Molnar <mingo@elte.hu>
Thu, 14 Aug 2008 10:19:59 +0000 (12:19 +0200)
Conflicts:

include/asm-x86/dma-mapping.h

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

Trivial merge