From: Ingo Molnar <mingo@elte.hu>
Date: Wed, 17 Jun 2009 11:06:17 +0000 (+0200)
Subject: Merge branch 'linus' into perfcounters/core
X-Git-Tag: v2.6.31-rc1~93^2~25
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a3d06cc6aa3e765dc2bf98626f87272dcf641dca;p=pandora-kernel.git

Merge branch 'linus' into perfcounters/core

Conflicts:
	arch/x86/include/asm/kmap_types.h
	include/linux/mm.h

	include/asm-generic/kmap_types.h

Merge reason: We crossed changes with kmap_types.h cleanups in mainline.

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

a3d06cc6aa3e765dc2bf98626f87272dcf641dca
Reading git-diff-tree failed