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