projects / platform / kernel / linux-exynos.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2d2e7d1 d02b370)
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)
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


Trivial merge
Domain: System / Kernel;