summaryrefslogtreecommitdiffstats
path: root/virt
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2009-01-09 03:37:48 -0500
committerLen Brown <len.brown@intel.com>2009-01-09 03:37:48 -0500
commitd0302bc62af7983040ea1cd1b5dd2b36e1a6a509 (patch)
treeef45618ae057e21fff7c82190939fe5f4466cf06 /virt
parent106ad8d6b0a7c1a597fab56ec692c39f553fabbc (diff)
parent237889bf0a62f1399fb2ba0c2a259e6a96597131 (diff)
downloadop-kernel-dev-d0302bc62af7983040ea1cd1b5dd2b36e1a6a509.zip
op-kernel-dev-d0302bc62af7983040ea1cd1b5dd2b36e1a6a509.tar.gz
Merge branch 'misc' into release
Conflicts: include/acpi/acpixf.h Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'virt')
0 files changed, 0 insertions, 0 deletions
OpenPOWER on IntegriCloud