git.stricted.de - GitHub/exynos8895/android_kernel_samsung

author	Ingo Molnar <mingo@elte.hu>
	Thu, 2 Apr 2009 14:33:42 +0000 (16:33 +0200)
committer	Ingo Molnar <mingo@elte.hu>
	Thu, 2 Apr 2009 14:33:51 +0000 (16:33 +0200)
commit	83f2f0ed715eb15a8e13c07df479d65bbc10d8d5
tree	e47d7edefa210b328f8cfba43d170fc67d6e0671	tree \| snapshot (tar.gz zip)
parent	3de46fda4c104deef17ec70f85361f5c6b84ce0e	commit \| diff
parent	4fe70410d9a219dabb47328effccae7e7f2a6e26	commit \| diff

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>