tree 100ee9bb6f13fc0fb3d1887516712541a5fc0769
parent 81450b73dde07f473a4a7208b209b4c8b7251d90
parent db2d4ccdc8f9f3433d3a8566404189f2e9295c23
author Len Brown <len.brown@intel.com> 1171681832 -0500
committer Len Brown <len.brown@intel.com> 1171681832 -0500

Pull fluff into release branch

Conflicts:

	arch/x86_64/pci/mmconfig.c
	drivers/acpi/bay.c

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