Merge branch 'isdn-next'

Browse source

Tilman Schmidt says:

====================
ISDN patches for net-next

Here's a series of patches for the Gigaset ISDN driver and one for
the ISDN CAPI subsystem.  Please merge as appropriate.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>

...

This commit is contained in:

David S. Miller 2014-12-10 15:06:14 -05:00

parent 340b6e59fb 330078abd8

commit 7d339890e7

4 changed files with 38 additions and 46 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

2

drivers/isdn/capi/capiutil.c

View file

2

drivers/isdn/gigaset/Kconfig

View file

3

drivers/isdn/gigaset/gigaset.h

View file

77

drivers/isdn/gigaset/usb-gigaset.c

View file