From: Linus Torvalds Date: Thu, 17 Apr 2014 19:31:07 +0000 (-0700) Subject: Merge branch 'ipmi' (emailed ipmi fixes) X-Git-Tag: v3.15-rc2~27 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c2896def9750fdb84604bbcf917dee1e7b0c20a3;p=profile%2Fcommon%2Fplatform%2Fkernel%2Flinux-artik7.git Merge branch 'ipmi' (emailed ipmi fixes) Merge ipmi fixes from Corey Minyard: "Things collected since last kernel release. Some of these are pretty important. The first three are bug fixes. The next two are to hopefully make everyone happy about allowing ACPI to be on all the time and not have IPMI have an effect on the system when not in use. The last is a little cleanup" * emailed patches from Corey Minyard : ipmi: boolify some things ipmi: Turn off all activity on an idle ipmi interface ipmi: Turn off default probing of interfaces ipmi: Reset the KCS timeout when starting error recovery ipmi: Fix a race restarting the timer Char: ipmi_bt_sm, fix infinite loop --- c2896def9750fdb84604bbcf917dee1e7b0c20a3