From: Ingo Molnar <mingo@elte.hu>
Date: Fri, 2 Jan 2009 21:41:36 +0000 (+0100)
Subject: Merge branch 'linus' into x86/cleanups
X-Git-Tag: v2.6.29-rc1~536^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=923a789b49c7269a0245d5af6afe486188d940df;p=pandora-kernel.git

Merge branch 'linus' into x86/cleanups

Conflicts:
	arch/x86/kernel/reboot.c
---

923a789b49c7269a0245d5af6afe486188d940df
Reading git-diff-tree failed