summaryrefslogtreecommitdiffstats
path: root/drivers/vfio
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2014-05-20 13:22:15 +0200
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2014-05-20 13:22:15 +0200
commit55cc33ceb75643d190ed215f423972e0b7ae7aeb (patch)
treee9573d995bfae0f81ce800433b424bb998f90eca /drivers/vfio
parent1f0b63866fc1be700260547be8edf8e6f0af37f2 (diff)
parentf71495f3f0c5f0801823d1235b271a4a415d3df8 (diff)
downloadlinux-55cc33ceb75643d190ed215f423972e0b7ae7aeb.tar.bz2
Merge branch 'pm-sleep' into acpi-pm
Diffstat (limited to 'drivers/vfio')
0 files changed, 0 insertions, 0 deletions