Merge branch 'ipmi' into release
authorLen Brown <len.brown@intel.com>
Wed, 12 Jan 2011 10:03:13 +0000 (05:03 -0500)
committerLen Brown <len.brown@intel.com>
Wed, 12 Jan 2011 10:03:13 +0000 (05:03 -0500)
commit4b63bd35eb4e7959b0f7be17634689d34311524b
tree2dad174e4ef8cbe5ef86541a8496b5f97dcf35d1
parent03b6e6e58d9dd5f3068288653810db3c15fde929
parente92b297cc72ade7a58eaec7e01c906d856f8ab6e
Merge branch 'ipmi' into release
drivers/acpi/Kconfig
drivers/acpi/Makefile
drivers/char/ipmi/ipmi_si_intf.c