diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-25 16:25:31 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-25 16:25:31 -0700 |
| commit | b20f9e5bddddb5ef0d743d6e0d409ffc8cf9fc56 (patch) | |
| tree | 7654b53ebb9af77b5daeab696d1d48069ae631a1 /Makefile | |
| parent | 5260562754c0aa4b95eebb1f851eaccce7286365 (diff) | |
| parent | b11e7b3f3b56119194234085d42a633ceabd6aba (diff) | |
| download | blackbird-op-linux-b20f9e5bddddb5ef0d743d6e0d409ffc8cf9fc56.tar.gz blackbird-op-linux-b20f9e5bddddb5ef0d743d6e0d409ffc8cf9fc56.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: (24 commits)
hwmon: lis3: Release resources in case of failure
hwmon: lis3: Short explanations of platform data fields
hwmon: lis3: Enhance lis3 selftest with IRQ line test
hwmon: lis3: use block read to access data registers
hwmon: lis3: Adjust fuzziness for 8 bit device
hwmon: lis3: New parameters to platform data
hwmon: lis3: restore axis enabled bits
hwmon: lis3: Power on corrections
hwmon: lis3: Update coordinates at polled device open
hwmon: lis3: Cleanup interrupt handling
hwmon: lis3: regulator control
hwmon: lis3: pm_runtime support
Kirkwood: add fan support for Network Space Max v2
hwmon: add generic GPIO fan driver
hwmon: (coretemp) fix reading of microcode revision (v2)
hwmon: ({core, pkg, via-cpu}temp) remove unnecessary CONFIG_HOTPLUG_CPU ifdefs
hwmon: (pkgtemp) align driver initialization style with coretemp
hwmon: LTC4261 Hardware monitoring driver
hwmon: (lis3) add axes module parameter for custom axis-mapping
hwmon: (hp_accel) Add HP Mini 510x family support
...
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions
