Pull fluff into release branch
authorLen Brown <len.brown@intel.com>
Sat, 17 Feb 2007 03:10:32 +0000 (22:10 -0500)
committerLen Brown <len.brown@intel.com>
Sat, 17 Feb 2007 03:10:32 +0000 (22:10 -0500)
Conflicts:

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

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

Trivial merge