From: Ingo Molnar <mingo@elte.hu>
Date: Sat, 26 Jul 2008 13:30:40 +0000 (+0200)
Subject: Merge branch 'linus' into x86/header-guards
X-Git-Tag: v2.6.28-rc1~734^2~4^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1503af661947b7a4a09355cc2ae6aa0d43f16776;p=pandora-kernel.git

Merge branch 'linus' into x86/header-guards

Conflicts:

	include/asm-x86/gpio.h
	include/asm-x86/ide.h

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

1503af661947b7a4a09355cc2ae6aa0d43f16776
Reading git-diff-tree failed