Import of acpica-unix2-20130725
Merge branch 'acpica'