diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-02-03 22:19:15 +0100 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-02-03 22:19:15 +0100 |
commit | 424414947da3dd5cb0d60e4f299f7c51e472ae77 (patch) | |
tree | a4067480c4256c80ae8f8438a3e4bb88e32050bc /include/dt-bindings/thermal/thermal.h | |
parent | a3683e0c1410c5c8136a7a93b0336ce88d3b893a (diff) | |
parent | d07830db1bdb254e4b50d366010b219286b8c937 (diff) |
Merge tag 'usb-serial-4.10-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial into usb-linus
Johan writes:
USB-serial fixes for v4.10-rc7
One more device ID for pl2303.
Signed-off-by: Johan Hovold <johan@kernel.org>
Diffstat (limited to 'include/dt-bindings/thermal/thermal.h')