tree 34fceea3ab0f777df2e72729f393661e7001cee1
parent c772fc26f8938dd526a411a6162db95a33f56028
parent a6c16c2803089f032f86fe15e952176c0713d6e3
author Linus Torvalds <torvalds@linux-foundation.org> 1350436101 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1350436101 -0700

Merge branch 'ipmi' (IPMI patches from Corey Minyard)

Merge emailed patches from Corey Minyard:
 "Remove some bogus docs, Fix ACPI/IPMI interactions, fix some warnings,
  and add register spacing detection for PCI interfaces."

* ipmi:
  IPMI: Detect register spacing on PCI interfaces
  IPMI: Fix some uninitialized warning
  IPMI: Change link order
  ACPI: Reorder IPMI driver before any other ACPI drivers
  IPMI: Remove SMBus driver info from the docs