| commit | b2e448eca1a52fea181905845728ae00a138d84e | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Sat Jan 25 15:33:41 2014 -0800 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Sat Jan 25 15:33:41 2014 -0800 |
| tree | d1f9517a6dacf53f4401e8ab752737e1f5021acc | |
| parent | 2d2e7d195b902c419bc0b69ced026aca444d69a8 [diff] | |
| parent | d02b3709ff8efebfca0612d0ac2a6e31a91c13f4 [diff] |
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