aboutsummaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorLinus Torvalds2011-08-25 10:31:40 -0700
committerLinus Torvalds2011-08-25 10:31:40 -0700
commite5b1d9cc1dc7cf76147411f1a74f64b570e148e3 (patch)
tree32a319dbb68519faca1357916e34f1e63c953fd1 /tools
parentf385b6974bf93cd4335495437a6ee82fa5237df7 (diff)
parentb4cb0d4da745bc1d806b9b4a27cc4ce1f7adbf99 (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: (i5k_amb) Drop i5k_channel_pci_id hwmon: (ntc_thermistor) Simplify if sequence
Diffstat (limited to 'tools')
0 files changed, 0 insertions, 0 deletions