From: Robert Richter <robert.richter@amd.com>
Date: Wed, 24 Sep 2008 09:25:31 +0000 (+0200)
Subject: Merge commit 'v2.6.27-rc5' into tip/oprofile
X-Git-Tag: v2.6.28-rc1~35^2~15^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f78e80209cf143be49f268c340431ae9fa3abb74;p=pandora-kernel.git

Merge commit 'v2.6.27-rc5' into tip/oprofile

Conflicts:
	arch/x86/oprofile/nmi_int.c
---

f78e80209cf143be49f268c340431ae9fa3abb74
Reading git-diff-tree failed