Merge branch 'ipmi' into release

author Len Brown <len.brown@intel.com>

Wed, 12 Jan 2011 10:03:13 +0000 (05:03 -0500)

committer Len Brown <len.brown@intel.com>

Wed, 12 Jan 2011 10:03:13 +0000 (05:03 -0500)
author Len Brown <len.brown@intel.com>
Wed, 12 Jan 2011 10:03:13 +0000 (05:03 -0500)
committer Len Brown <len.brown@intel.com>
Wed, 12 Jan 2011 10:03:13 +0000 (05:03 -0500)
diff --cc drivers/acpi/Kconfig
Simple merge
diff --cc drivers/acpi/Makefile
Simple merge
diff --cc drivers/char/ipmi/ipmi_si_intf.c
Simple merge
author	Len Brown <len.brown@intel.com>
	Wed, 12 Jan 2011 10:03:13 +0000 (05:03 -0500)
committer	Len Brown <len.brown@intel.com>
	Wed, 12 Jan 2011 10:03:13 +0000 (05:03 -0500)
		1	2
drivers/acpi/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/acpi/Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/char/ipmi/ipmi_si_intf.c	patch \|	diff1 \|	diff2 \|	blob \| history