diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-04-14 18:45:14 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-04-14 18:45:14 -0700 |
| commit | f5c07a2d8acfc98e00d3be6298f979e5b3175953 (patch) | |
| tree | 9205f755cbb3fa0d7524567c697ccf7d1687afe1 /fs/ceph/osdmap.c | |
| parent | 7223b915421716b4e57ffb7e13f41f1b926db55c (diff) | |
| parent | d618540fb3e5b74e16aec8201d2d0de6f02633cb (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: (applesmc) Switch maintainers
hwmon: (applesmc) Add iMac9,1 and MacBookPro2,2 support
hwmon: (it87) Invalidate cache on temperature sensor change
hwmon: (it87) Properly handle wrong sensor type requests
hwmon: (it87) Don't arbitrarily enable temperature channels
hwmon: (sht15) Properly handle the case CONFIG_REGULATOR=n
hwmon: (sht15) Fix sht15_calc_temp interpolation function
Diffstat (limited to 'fs/ceph/osdmap.c')
0 files changed, 0 insertions, 0 deletions