From: Ingo Molnar <mingo@elte.hu>
Date: Mon, 6 Oct 2008 14:15:57 +0000 (+0200)
Subject: Merge branch 'x86/header-guards' into x86-v28-for-linus-phase1
X-Git-Tag: v2.6.28-rc1~734^2~4
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b8cd9d056bbc5f2630ab1787dbf76f83bbb517c0;p=pandora-kernel.git

Merge branch 'x86/header-guards' into x86-v28-for-linus-phase1

Conflicts:
	include/asm-x86/dma-mapping.h
	include/asm-x86/gpio.h
	include/asm-x86/idle.h
	include/asm-x86/kvm_host.h
	include/asm-x86/namei.h
	include/asm-x86/uaccess.h

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

b8cd9d056bbc5f2630ab1787dbf76f83bbb517c0
Reading git-diff-tree failed