]> nv-tegra.nvidia Code Review - linux-2.6.git/commit
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)
commit83f2f0ed715eb15a8e13c07df479d65bbc10d8d5
treee47d7edefa210b328f8cfba43d170fc67d6e0671
parent3de46fda4c104deef17ec70f85361f5c6b84ce0e
parent4fe70410d9a219dabb47328effccae7e7f2a6e26
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>