tree a22a9d46f2abd9ac4b2cbbb9e30a11abe0b7e31d
parent ae7a835cc546fc67df90edaaa0c48ae2b22a29fe
parent fdbeb7de700a3c8fc85d7e595a6bf1c92a27c0a1
author Linus Torvalds <torvalds@linux-foundation.org> 1378395278 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1378395278 -0700

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()