From: Ingo Molnar <mingo@elte.hu>
Date: Tue, 23 Dec 2008 15:29:31 +0000 (+0100)
Subject: Merge branch 'x86/ptrace' into x86/tsc
X-Git-Tag: v2.6.29-rc1~586^2~1^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7e3cbc3f774f31ecd88a51edae3d9377f60a4c00;p=pandora-kernel.git

Merge branch 'x86/ptrace' into x86/tsc

Conflicts:
	arch/x86/kernel/cpu/intel.c
---

7e3cbc3f774f31ecd88a51edae3d9377f60a4c00
Reading git-diff-tree failed