]> git.openfabrics.org - ~shefty/rdma-dev.git/commitdiff
Merge branch 'ipmi' (IPMI patches from Corey Minyard)
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 17 Oct 2012 01:08:21 +0000 (18:08 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 17 Oct 2012 01:08:21 +0000 (18:08 -0700)
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


Trivial merge