diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2014-01-25 15:33:41 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-01-25 15:33:41 -0800 |
| commit | b2e448eca1a52fea181905845728ae00a138d84e (patch) | |
| tree | d1f9517a6dacf53f4401e8ab752737e1f5021acc /fs/9p/vfs_inode.c | |
| parent | Merge tag 'spi-v3.14-2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi (diff) | |
| parent | ipmi: Cleanup error return (diff) | |
| download | linux-dev-b2e448eca1a52fea181905845728ae00a138d84e.tar.xz linux-dev-b2e448eca1a52fea181905845728ae00a138d84e.zip | |
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
Diffstat (limited to 'fs/9p/vfs_inode.c')
0 files changed, 0 insertions, 0 deletions