| commit | de505e709ffb09a7382ca8e0d8c7dbb171ba5830 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Sat Jun 18 20:33:31 2011 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Sat Jun 18 20:33:31 2011 -0700 |
| tree | ee69d6317517ee4b9e2be482a7d051ede12ef38c | |
| parent | c11760c6d80ab6aa20e383cf378a7287305f591c [diff] | |
| parent | b1e698db0939b04602ded2a2196ff69c92b49378 [diff] |
Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/staging * 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/staging: hwmon: (s3c) Initialize sysfs attributes hwmon: (ibmpex) Initialize sysfs attributes hwmon: (ibmaem) Initialize sysfs attributes hwmon: (asus_atk0110) Consolidate sysfs attribute initialization hwmon: (coretemp) Drop unused struct members