Merge branch 'ipmi' into release
Len Brown [Wed, 12 Jan 2011 10:03:13 +0000 (05:03 -0500)]
1  2 
drivers/acpi/Kconfig
drivers/acpi/Makefile
drivers/char/ipmi/ipmi_si_intf.c

Simple merge
Simple merge
Simple merge