]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge branch 'fixes-next' into linux-next
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Tue, 2 Apr 2013 13:35:05 +0000 (15:35 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Tue, 2 Apr 2013 13:35:05 +0000 (15:35 +0200)
commit2b6a34fdc364277939321e9831f3d724047a9867
treeb109a1cf2696e977c192ddc8fb0a5601fa4d3ab3
parentddb8c25794264a207a8a990149649ac2ca356e80
parentb82a2caa252c7bd712a7e224683f06b41cf831de
Merge branch 'fixes-next' into linux-next

* fixes-next:
  cpuidle / ACPI: recover percpu ACPI processor cstate
  ACPI / I2C: Use parent's ACPI_HANDLE() in acpi_i2c_register_devices()
  cpufreq: Correct header guards typo
  ACPI / SPI: Use parent's ACPI_HANDLE() in acpi_register_spi_devices()
  cpufreq: check OF node /cpus presence before dereferencing it
  PM / devfreq: Fix compiler warnings for CONFIG_PM_DEVFREQ unset
  PM / QoS: Avoid possible deadlock related to sysfs access
  USB / PM: Don't try to hide PM QoS flags from usb_port_device_release()

Conflicts:
drivers/cpufreq/cpufreq_governor.h
drivers/cpufreq/cpufreq-cpu0.c
drivers/cpufreq/cpufreq_governor.h