From: Ingo Molnar <mingo@elte.hu>
Date: Wed, 19 Nov 2008 08:44:37 +0000 (+0100)
Subject: Merge branch 'linus' into sched/core
X-Git-Tag: v2.6.29-rc1~538^2~60
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=3ac3ba0b396fd99550e08034b0e4c27fdf39c252;p=linux-2.6-omap-h63xx.git

Merge branch 'linus' into sched/core

Conflicts:
	kernel/Makefile
---

3ac3ba0b396fd99550e08034b0e4c27fdf39c252