| commit | 18020a0d8cccad0d3642219d6aef789420c04c1f | |
| author | Linus Torvalds <torvalds@linux-foundation.org> | |
| Wed, 24 Mar 2010 23:41:48 +0000 (24 16:41 -0700) | ||
| committer | Linus Torvalds <torvalds@linux-foundation.org> | |
| Wed, 24 Mar 2010 23:41:48 +0000 (24 16:41 -0700) | ||
| tree | 73fba2c01ae2e5638c7bf0e271daf4bfa5418fa0 | treesnapshot (tar.gz zip) |
| parent | c27b9a2e6c29eac2fe770bd1071007c9f8c43de5 | commitdiff |
| parent | 0f5ed04cb365ce0117b0588c4d9ed89f2623650b | commitdiff |
Merge branch 'i2c-for-linus' of git://git./linux/kernel/git/jdelvare/staging
* 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging:
i2c-scmi: Provide module aliases for automatic loading
i2c-scmi: Support IBM SMBus CMI devices
acpi: Support IBM SMBus CMI devices
* 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging:
i2c-scmi: Provide module aliases for automatic loading
i2c-scmi: Support IBM SMBus CMI devices
acpi: Support IBM SMBus CMI devices