diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2011-08-25 10:31:40 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-08-25 10:31:40 -0700 |
| commit | e5b1d9cc1dc7cf76147411f1a74f64b570e148e3 (patch) | |
| tree | 32a319dbb68519faca1357916e34f1e63c953fd1 /tools/power/cpupower/Makefile | |
| parent | Merge branch '3.1-rc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending (diff) | |
| parent | hwmon: (i5k_amb) Drop i5k_channel_pci_id (diff) | |
| download | linux-dev-e5b1d9cc1dc7cf76147411f1a74f64b570e148e3.tar.xz linux-dev-e5b1d9cc1dc7cf76147411f1a74f64b570e148e3.zip | |
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/power/cpupower/Makefile')
0 files changed, 0 insertions, 0 deletions