diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-10-29 08:14:58 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-10-29 08:14:58 -0700 |
commit | e281e315f438093cbf27b4acdee364e781337a7a (patch) | |
tree | 4cfb1aa49c638091c3ed6ef7d65b4421dd13ee61 /include/linux/if_ppp.h | |
parent | 49b766ec12650db38e98caafa3cd94e8ff59000c (diff) | |
parent | 371dc4a6d8c3c74a9a1c74b87c2affb3fcef6500 (diff) |
Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging
* 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging:
hwmon: (it87) Fix VID reading on IT8718F/IT8720F
hwmon: (dme1737) No vid attributes for SCH311x
hwmon: (fschmd) Fix check on unsigned in watchdog_write()
hwmon: (coretemp) Maintainer update
Diffstat (limited to 'include/linux/if_ppp.h')
0 files changed, 0 insertions, 0 deletions