projects / GitHub / LineageOS / G12 / android_kernel_amlogic_linux-4.9.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d6e0a2d df45c71)
Merge branch 'acpi-tpm' into acpi-dsm
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Sun, 5 Jan 2014 14:55:34 +0000 (15:55 +0100)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Sun, 5 Jan 2014 14:55:34 +0000 (15:55 +0100)

Trivial merge