git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 01ce87e)
USB: ftdi_sio: PID for NZR SEM 16+ USB
authorHorst Schirmeier <horst@schirmeier.com>
Thu, 30 Aug 2012 22:00:28 +0000 (00:00 +0200)
committerBen Hutchings <ben@decadent.org.uk>
Wed, 19 Sep 2012 14:05:15 +0000 (15:05 +0100)
commit 26a538b9ea2a3ee10dafc0068f0560dfd7b7ba37 upstream.

This adds the USB PID for the NZR SEM 16+ USB energy monitor device
<http://www.nzr.de>.  It works perfectly with the GPL software on
<http://schou.dk/linux/sparometer/>.

Signed-off-by: Horst Schirmeier <horst@schirmeier.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
drivers/usb/serial/ftdi_sio.c patch | blob | history
drivers/usb/serial/ftdi_sio_ids.h patch | blob | history

diff --cc drivers/usb/serial/ftdi_sio.c
Simple merge
diff --cc drivers/usb/serial/ftdi_sio_ids.h
Simple merge
Pandora Kernel Repository