From: Ingo Molnar <mingo@elte.hu>
Date: Fri, 13 Feb 2009 20:05:03 +0000 (+0100)
Subject: Merge branch 'core/header-fixes' into x86/headers
X-Git-Tag: v2.6.30-rc3~72^2~31^2~2^4
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=22796b15725488002437ebbf98a22fdbe596cf89;p=pandora-kernel.git

Merge branch 'core/header-fixes' into x86/headers

Conflicts:
	arch/x86/include/asm/setup.h
---

22796b15725488002437ebbf98a22fdbe596cf89
Reading git-diff-tree failed