Merge branch 'ipmi' (ipmi patches from Corey Minyard)