]> git.karo-electronics.de Git - karo-tx-linux.git/commit - drivers/powercap/powercap_sys.c
Merge branch 'acpi-assorted-next' into linux-next
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Fri, 18 Oct 2013 20:16:24 +0000 (22:16 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Fri, 18 Oct 2013 20:16:24 +0000 (22:16 +0200)
commit6989fe8ead892e589f150e3c1225b860a12066af
tree2b1d8fcd286626bf2b4f6045cc74bab56dc9ea1b
parentbe02d80cdf9f73bb153ec5467ee7d4e509b65a4c
parent5e2be4e0edff4a1021b6743ca6859129cd8e7067
Merge branch 'acpi-assorted-next' into linux-next

* acpi-assorted-next:
  ACPI / osl: remove an unneeded NULL check
drivers/acpi/osl.c