From: Ingo Molnar <mingo@elte.hu>
Date: Thu, 2 Apr 2009 14:33:42 +0000 (+0200)
Subject: Merge branch 'linus' into x86/urgent
X-Git-Tag: v2.6.30-rc1~211^2~6
X-Git-Url: https://git.kernelconcepts.de/?p=karo-tx-linux.git;a=commitdiff_plain;h=83f2f0ed715eb15a8e13c07df479d65bbc10d8d5

Merge branch 'linus' into x86/urgent

Merge needed to go past commit 7ca43e756 (mm: use debug_kmap_atomic)
and fix it.

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

83f2f0ed715eb15a8e13c07df479d65bbc10d8d5