diff options
| author | Linus Torvalds | 2010-04-15 03:45:14 +0200 |
|---|---|---|
| committer | Linus Torvalds | 2010-04-15 03:45:14 +0200 |
| commit | f5c07a2d8acfc98e00d3be6298f979e5b3175953 (patch) | |
| tree | 9205f755cbb3fa0d7524567c697ccf7d1687afe1 /fs/ceph/caps.c | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus (diff) | |
| parent | hwmon: (applesmc) Switch maintainers (diff) | |
| download | kernel-qcow2-linux-f5c07a2d8acfc98e00d3be6298f979e5b3175953.tar.gz kernel-qcow2-linux-f5c07a2d8acfc98e00d3be6298f979e5b3175953.tar.xz kernel-qcow2-linux-f5c07a2d8acfc98e00d3be6298f979e5b3175953.zip | |
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/caps.c')
0 files changed, 0 insertions, 0 deletions