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

Conflicts:
	arch/x86/oprofile/nmi_int.c

diff --cc arch/x86/oprofile/nmi_int.c
index 287513a0981907bea5cba717ff793c80a50639fa,0227694f7dab9b156350eaef0e90f79e8ec2ecc4..d988574107463737a44471b4445f92f16dfd1f9f
--- 1/arch/x86/oprofile/nmi_int.c
--- 2/arch/x86/oprofile/nmi_int.c
+++ b/arch/x86/oprofile/nmi_int.c
@@@ -468,7 -488,11 +494,10 @@@ int __init op_nmi_init(struct oprofile_
                return -ENODEV;
        }
  
 -      init_sysfs();
+ #ifdef CONFIG_SMP
+       register_cpu_notifier(&oprofile_cpu_nb);
+ #endif
 -      using_nmi = 1;
 +      /* default values, can be overwritten by model */
        ops->create_files = nmi_create_files;
        ops->setup = nmi_setup;
        ops->shutdown = nmi_shutdown;
@@@ -489,8 -505,10 +518,12 @@@
  
  void op_nmi_exit(void)
  {
-       if (using_nmi)
+       if (using_nmi) {
                exit_sysfs();
+ #ifdef CONFIG_SMP
+               unregister_cpu_notifier(&oprofile_cpu_nb);
+ #endif
+       }
 +      if (model->exit)
 +              model->exit();
  }

diff --cc drivers/oprofile/cpu_buffer.c
Simple merge

diff --cc include/linux/pci_ids.h
Simple merge