Upstream hash: 6b0b8eedff90b2789f6a7a627dbb3acfdd9d889d
Merge branch 'acpica'

Conflicts:
	sys/external/bsd/acpica/dist/debugger/dbmethod.c