Merge branch 'acpica' into acpi-ec
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Thu, 5 Feb 2015 14:42:08 +0000 (15:42 +0100)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Thu, 5 Feb 2015 14:42:08 +0000 (15:42 +0100)
commit38220a5e89389b587647128220cd328a5dc92e42
tree3b112a1fcc3828b2dfa9cb8f8d092b3eee4b6e14
parent550b3aac5a72c4209f1ad3bc0ade663d5cb36f7f
parent2eedd3d8398b266ee8e846ded03218bb6a00e2c1
Merge branch 'acpica' into acpi-ec