linux/drivers/isdn
David S. Miller f24001941c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Fix merge between commit 3adadc08cc ("net ax25: Reorder ax25_exit to
remove races") and commit 0ca7a4c87d ("net ax25: Simplify and
cleanup the ax25 sysctl handling")

The former moved around the sysctl register/unregister calls, the
later simply removed them.

With help from Stephen Rothwell.

Signed-off-by: David S. Miller <davem@davemloft.net>
2012-04-23 23:15:17 -04:00
..
act2000 isdn: whitespace coding style cleanup 2012-02-21 09:04:01 -08:00
capi Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next 2012-03-20 21:04:47 -07:00
divert isdn: whitespace coding style cleanup 2012-02-21 09:04:01 -08:00
gigaset isdn/gigaset: use gig_dbg() for debugging output 2012-04-09 10:30:38 -07:00
hardware Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2012-04-02 17:53:39 -07:00
hisax Remove all #inclusions of asm/system.h 2012-03-28 18:30:03 +01:00
hysdn isdn/hysdn: Convert to kstrtoul_from_user 2012-04-15 03:23:31 -04:00
i4l Remove all #inclusions of asm/system.h 2012-03-28 18:30:03 +01:00
icn isdn: whitespace coding style cleanup 2012-02-21 09:04:01 -08:00
isdnloop isdn: whitespace coding style cleanup 2012-02-21 09:04:01 -08:00
mISDN isdn: whitespace coding style cleanup 2012-02-21 09:04:01 -08:00
pcbit Remove all #inclusions of asm/system.h 2012-03-28 18:30:03 +01:00
sc isdn: whitespace coding style cleanup 2012-02-21 09:04:01 -08:00
Kconfig um: switch to use of drivers/Kconfig 2011-11-02 14:15:41 +01:00
Makefile mISDN fix main ISDN Makefile 2008-08-02 16:28:20 +02:00