Merge branch 'acpica' into acpi-resources
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Tue, 3 Feb 2015 21:27:01 +0000 (22:27 +0100)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Tue, 3 Feb 2015 21:27:01 +0000 (22:27 +0100)
commitb2cd5dd71a59a85d910f52070992decd406f9da7
tree6eb847a2b953f5b8929f0d4b0623382fa0df3094
parente36f014edff70fc02b3d3d79cead1d58f289332e
parenta45de93eb10ae44446aec2c73d722562ab46092a
Merge branch 'acpica' into acpi-resources
arch/ia64/pci/pci.c