]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'acpi-hotplug-next' into linux-next
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Thu, 3 Oct 2013 00:41:41 +0000 (02:41 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Thu, 3 Oct 2013 00:41:41 +0000 (02:41 +0200)
* acpi-hotplug-next:
  ACPI / hotplug: Use kobject_init_and_add() instead of _init() and _add()
  ACPI / hotplug: Don't set kobject parent pointer explicitly
  ACPI / hotplug: Set kobject name via kobject_add(), not kobject_set_name()
  hotplug, powerpc, x86: Remove cpu_hotplug_driver_lock()

1  2 
drivers/acpi/sysfs.c

Simple merge