summaryrefslogtreecommitdiff
path: root/drivers/char/tpm/tpm.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-02-28 18:09:02 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2011-02-28 18:09:02 -0800
commit3e1f2356ce231488dc1fa844e5ce91bcb59fc2a1 (patch)
tree8a72df51c0ff3f7ac9e15b841e6a889c9202ba67 /drivers/char/tpm/tpm.c
parente6eb5ce1b202ac9cdcfda5be559c9b9d8ec7542c (diff)
parenta7254d68b61c7873ce20591f0c56bf0245b72a76 (diff)
Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/staging
* 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/staging: hwmon: (adt7411) add MODULE_DEVICE_TABLE hwmon: (ad7414) add MODULE_DEVICE_TABLE
Diffstat (limited to 'drivers/char/tpm/tpm.c')
0 files changed, 0 insertions, 0 deletions