From: Ingo Molnar <mingo@elte.hu>
Date: Sun, 19 Oct 2008 17:04:47 +0000 (+0200)
Subject: Merge branch 'linus' into tracing-v28-for-linus-v3
X-Git-Tag: v2.6.28-rc3~86^2~26^2~6
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3e10e879a8c334a5927d800a3663a24d562cfa31;p=pandora-kernel.git

Merge branch 'linus' into tracing-v28-for-linus-v3

Conflicts:
	init/main.c
	kernel/module.c
	scripts/bootgraph.pl
---

3e10e879a8c334a5927d800a3663a24d562cfa31
Reading git-diff-tree failed