]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'ipmi' (ipmi patches from Corey Minyard)
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 25 Jan 2014 23:33:41 +0000 (15:33 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 25 Jan 2014 23:33:41 +0000 (15:33 -0800)
commit57d28108f721bde21fef33358afe69d8cbb07da0
treed1f9517a6dacf53f4401e8ab752737e1f5021acc
parent1dca7a44c583c7c249b721b7c8a22aa2daa6aefd
parent2f0c919be84a560ebac0f209b92d9c383775cce2
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 <minyard@acm.org>:
  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