diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-25 00:41:48 +0100 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-25 00:41:48 +0100 |
commit | 18020a0d8cccad0d3642219d6aef789420c04c1f (patch) | |
tree | 73fba2c01ae2e5638c7bf0e271daf4bfa5418fa0 /drivers/gpu/drm/i915/i915_gem.c | |
parent | Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6 (diff) | |
parent | i2c-scmi: Provide module aliases for automatic loading (diff) | |
download | linux-18020a0d8cccad0d3642219d6aef789420c04c1f.tar.xz linux-18020a0d8cccad0d3642219d6aef789420c04c1f.zip |
Merge branch 'i2c-for-linus' of git://git.kernel.org/pub/scm/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
Diffstat (limited to 'drivers/gpu/drm/i915/i915_gem.c')
0 files changed, 0 insertions, 0 deletions