tree ef45618ae057e21fff7c82190939fe5f4466cf06
parent 106ad8d6b0a7c1a597fab56ec692c39f553fabbc
parent 237889bf0a62f1399fb2ba0c2a259e6a96597131
author Len Brown <len.brown@intel.com> 1231490268 -0500
committer Len Brown <len.brown@intel.com> 1231490268 -0500

Merge branch 'misc' into release

Conflicts:
	include/acpi/acpixf.h

Signed-off-by: Len Brown <len.brown@intel.com>