Merge branch 'linus' into x86/urgent
authorIngo Molnar <mingo@elte.hu>
Thu, 2 Apr 2009 14:33:42 +0000 (16:33 +0200)
committerIngo Molnar <mingo@elte.hu>
Thu, 2 Apr 2009 14:33:51 +0000 (16:33 +0200)
Merge needed to go past commit 7ca43e756 (mm: use debug_kmap_atomic)
and fix it.

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

Trivial merge