diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-30 01:42:08 +0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-30 01:42:08 +0400 |
| commit | 9d54e2c0b0a03b0f05fc4f988323c858ec9d7740 (patch) | |
| tree | 1970d43e9b77f6b73cc323687984497b63095139 /fs/ceph/caps.c | |
| parent | 7b12887244293eb54acd07c6296b830b3af0f6da (diff) | |
| parent | b00d8a7e299eab9970b0ba75a4e2ea1df39059ad (diff) | |
| download | linux-9d54e2c0b0a03b0f05fc4f988323c858ec9d7740.tar.xz | |
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: (asc7621) Add X58 entry in Kconfig
hwmon: (w83793) Saving negative errors in unsigned
hwmon: (coretemp) Add missing newline to dev_warn() message
hwmon: (coretemp) Fix cpu model output
Diffstat (limited to 'fs/ceph/caps.c')
0 files changed, 0 insertions, 0 deletions