aboutsummaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorLinus Torvalds2010-05-11 17:38:04 -0700
committerLinus Torvalds2010-05-11 17:38:04 -0700
commitcea0d767c29669bf89f86e4aee46ef462d2ebae8 (patch)
treee7f65605979547a2ecfd2ec26e9374cbe25ff1a7 /net
parentb2464ab2023f20aea23ef8df1cb45b338c859ea5 (diff)
parent0559a538899d48e7d730affb9df2abb13a7d9008 (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) Correct sysfs fan error handling hwmon: (asc7621) Bug fixes
Diffstat (limited to 'net')
0 files changed, 0 insertions, 0 deletions