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)
commitf78e80209cf143be49f268c340431ae9fa3abb74
tree820fa64b688099dfdd93d27ba03252738ca5c7e2
parent4c168eaf7ea39f25a45a3d8c7eebc3fedb633a1d
parent24342c34a022ee90839873d91396045e12ef1090
Merge commit 'v2.6.27-rc5' into tip/oprofile

Conflicts:
arch/x86/oprofile/nmi_int.c
arch/x86/oprofile/nmi_int.c
drivers/oprofile/cpu_buffer.c
include/linux/pci_ids.h