| commit | e5b1d9cc1dc7cf76147411f1a74f64b570e148e3 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Thu Aug 25 10:31:40 2011 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Thu Aug 25 10:31:40 2011 -0700 |
| tree | 32a319dbb68519faca1357916e34f1e63c953fd1 | |
| parent | f385b6974bf93cd4335495437a6ee82fa5237df7 [diff] | |
| parent | b4cb0d4da745bc1d806b9b4a27cc4ce1f7adbf99 [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