aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/char
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-03-24 16:41:48 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2010-03-24 16:41:48 -0700
commit18020a0d8cccad0d3642219d6aef789420c04c1f (patch)
tree73fba2c01ae2e5638c7bf0e271daf4bfa5418fa0 /drivers/char
parentMerge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6 (diff)
parenti2c-scmi: Provide module aliases for automatic loading (diff)
downloadlinux-dev-18020a0d8cccad0d3642219d6aef789420c04c1f.tar.xz
linux-dev-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/char')
0 files changed, 0 insertions, 0 deletions