summaryrefslogtreecommitdiff
path: root/fs
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-08-25 15:41:18 (GMT)
committerLinus Torvalds <torvalds@linux-foundation.org>2010-08-25 15:41:18 (GMT)
commit5a559057b4fa0f60b2772fb590bf13e90af7a57d (patch)
tree193391b65af88f56ffc440a37cac29f363e79a8c /fs
parent5e686019df425a4fd8003ce7f6eaccbe537331d8 (diff)
parent968591298514167d05b0379377757ddefc76f022 (diff)
downloadlinux-5a559057b4fa0f60b2772fb590bf13e90af7a57d.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: MAINTAINERS: hwmon/coretemp: Change maintainers hwmon: (k8temp) Differentiate between AM2 and ASB1 hwmon: (ads7871) Fix ads7871_probe error paths hwmon: (coretemp) Fix harmless build warning
Diffstat (limited to 'fs')
0 files changed, 0 insertions, 0 deletions