Merge branch 'ipmi'
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 5 Sep 2013 15:34:38 +0000 (08:34 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 5 Sep 2013 15:34:38 +0000 (08:34 -0700)
commit2386a3b0fbb0c2dcf29694c7df9a72cb268458f0
treea22a9d46f2abd9ac4b2cbbb9e30a11abe0b7e31d
parentae7a835cc546fc67df90edaaa0c48ae2b22a29fe
parentfdbeb7de700a3c8fc85d7e595a6bf1c92a27c0a1
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()