From: Linus Torvalds Date: Sat, 25 Jan 2014 23:33:41 +0000 (-0800) Subject: Merge branch 'ipmi' (ipmi patches from Corey Minyard) X-Git-Tag: Ubuntu-5.2.0-15.16~14140 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=b2e448eca1a52fea181905845728ae00a138d84e;p=mirror_ubuntu-eoan-kernel.git Merge branch 'ipmi' (ipmi patches from Corey Minyard) Merge ipmi fixes from Corey Minyard: "Just some collected fixes for 3.14. Nothing huge" * emailed patches from Corey Minyard : ipmi: Cleanup error return ipmi: fix timeout calculation when bmc is disconnected ipmi: use USEC_PER_SEC instead of 1000000 for more meaningful ipmi: remove deprecated IRQF_DISABLED --- b2e448eca1a52fea181905845728ae00a138d84e