diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-09-05 17:34:38 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-09-05 17:34:38 +0200 |
commit | 2386a3b0fbb0c2dcf29694c7df9a72cb268458f0 (patch) | |
tree | a22a9d46f2abd9ac4b2cbbb9e30a11abe0b7e31d /arch/s390/hypfs | |
parent | Merge branch 'next' of git://git.kernel.org/pub/scm/virt/kvm/kvm (diff) | |
parent | BMC support for PARISC machines (diff) | |
download | linux-2386a3b0fbb0c2dcf29694c7df9a72cb268458f0.tar.xz linux-2386a3b0fbb0c2dcf29694c7df9a72cb268458f0.zip |
Merge branch 'ipmi'
Merge IPMI fixes from:
"A few things for 3.12 from various people"
* emailed patches from Corey Minyard <minyard@acm.org>:
BMC support for PARISC machines
Add MODULE_ALIAS for autoloading ipmi driver on ACPI systems
ipmi: Initialize locals to avoid warning
ipmi: info leak in compat_ipmi_ioctl()
Diffstat (limited to 'arch/s390/hypfs')
0 files changed, 0 insertions, 0 deletions