diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-07-03 21:14:21 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-07-03 21:14:21 +0200 |
commit | 9a3c284a6dc894af066bbd6238a37996bb156c40 (patch) | |
tree | 1b5cb6064d036524b8880d4c100af249cc3eb6c1 /mm/cma.h | |
parent | Merge branch 'for-linus' of git://git.kernel.dk/linux-block (diff) | |
parent | hwmon: (w83627ehf) Use swap() in w82627ehf_swap_tempreg() (diff) | |
download | linux-9a3c284a6dc894af066bbd6238a37996bb156c40.tar.xz linux-9a3c284a6dc894af066bbd6238a37996bb156c40.zip |
Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging
Pull more hwmon updates from Jean Delvare.
* 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging:
hwmon: (w83627ehf) Use swap() in w82627ehf_swap_tempreg()
hwmon: Document which I2C addresses can be probed
hwmon: (w83792d) Additional PWM outputs support
Diffstat (limited to 'mm/cma.h')
0 files changed, 0 insertions, 0 deletions