Merge commit 'v2.6.27-rc5' into tip/oprofile
authorRobert Richter <robert.richter@amd.com>
Wed, 24 Sep 2008 09:25:31 +0000 (11:25 +0200)
committerRobert Richter <robert.richter@amd.com>
Wed, 24 Sep 2008 09:25:31 +0000 (11:25 +0200)
Conflicts:
arch/x86/oprofile/nmi_int.c


Trivial merge