]> git.karo-electronics.de Git - karo-tx-linux.git/commit - include/acpi/acpixf.h
Merge branch 'pm-devfreq-next' into linux-next
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Thu, 17 Oct 2013 13:47:22 +0000 (15:47 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Thu, 17 Oct 2013 13:47:22 +0000 (15:47 +0200)
commit0bc5f854079a6cc22597d107838a0abc1299d164
tree57421badcf96f38918dfe4ce27ddf97bc3a6f676
parentfd1b6d51e114be121460a07e9ccb2005928d0c88
parent6bdd326e740fb87a88a49189925ca12a02311c8b
Merge branch 'pm-devfreq-next' into linux-next

* pm-devfreq-next:
  PM / devfreq: Remove duplicate include of opp.h