tree 944bd894e77db00c1d30cd252614ac93c6c6bea5
parent 299cfe38081bea6dcd8b882375f6f65a980bccf9
parent 299cfe38081bea6dcd8b882375f6f65a980bccf9
parent 9e52797131e83688f66fbca6d4cd25b83f33c48f
author Len Brown <len.brown@intel.com> 1202373502 -0500
committer Len Brown <len.brown@intel.com> 1202373502 -0500

Merge branches 'release' and 'fluff' into release

Conflicts:

	drivers/acpi/scan.c
	include/linux/acpi.h

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