commit | cba8d1cb6608bba49803ddceef1ff889aa2ed316 | [log] [tgz] |
---|---|---|
author | Linus Torvalds <torvalds@linux-foundation.org> | Tue Oct 16 18:08:21 2012 -0700 |
committer | Linus Torvalds <torvalds@linux-foundation.org> | Tue Oct 16 18:08:21 2012 -0700 |
tree | 34fceea3ab0f777df2e72729f393661e7001cee1 | |
parent | c772fc26f8938dd526a411a6162db95a33f56028 [diff] | |
parent | a6c16c2803089f032f86fe15e952176c0713d6e3 [diff] |
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