linux/drivers/isdn
David S. Miller d4185bbf62 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
	drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c

Minor conflict between the BCM_CNIC define removal in net-next
and a bug fix added to net.  Based upon a conflict resolution
patch posted by Stephen Rothwell.

Signed-off-by: David S. Miller <davem@davemloft.net>
2012-11-10 18:32:51 -05:00
..
act2000 isdn: whitespace coding style cleanup 2012-02-21 09:04:01 -08:00
capi TTY: use tty_port_register_device 2012-08-13 16:50:19 -07:00
divert isdn: whitespace coding style cleanup 2012-02-21 09:04:01 -08:00
gigaset bas_gigaset: fix pre_reset handling 2012-10-26 02:20:36 -04:00
hardware isdn: Fix typo in drivers/isdn 2012-11-09 17:10:16 -05:00
hisax isdn: Fix typo in drivers/isdn 2012-11-09 17:10:16 -05:00
hysdn isdn/hysdn: Convert to kstrtoul_from_user 2012-04-15 03:23:31 -04:00
i4l isdn: Make CONFIG_ISDN depend on CONFIG_NETDEVICES 2012-11-07 18:59:26 -05:00
icn isdn: whitespace coding style cleanup 2012-02-21 09:04:01 -08:00
isdnloop isdnloop: fix and simplify isdnloop_init() 2012-08-03 16:53:22 -07:00
mISDN isdn: remove dead code 2012-10-26 03:46:41 -04:00
pcbit isdn: Fix typo in drivers/isdn 2012-11-09 17:10:16 -05:00
sc isdn: whitespace coding style cleanup 2012-02-21 09:04:01 -08:00
Kconfig isdn: Make CONFIG_ISDN depend on CONFIG_NETDEVICES 2012-11-07 18:59:26 -05:00
Makefile