linux-sg2042/drivers/isdn
David S. Miller b48b63a1f6 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
	net/netfilter/nfnetlink_log.c
	net/netfilter/xt_LOG.c

Rather easy conflict resolution, the 'net' tree had bug fixes to make
sure we checked if a socket is a time-wait one or not and elide the
logging code if so.

Whereas on the 'net-next' side we are calculating the UID and GID from
the creds using different interfaces due to the user namespace changes
from Eric Biederman.

Signed-off-by: David S. Miller <davem@davemloft.net>
2012-09-15 11:43:53 -04:00
..
act2000 isdn: whitespace coding style cleanup 2012-02-21 09:04:01 -08:00
capi isdn/capi: elliminate capincci_find() in non-middleware case 2012-05-07 22:37:57 -04:00
divert isdn: whitespace coding style cleanup 2012-02-21 09:04:01 -08:00
gigaset drivers/isdn/gigaset/common.c: Remove useless kfree 2012-09-13 17:05:17 -04:00
hardware mISDN: Fix wrong usage of flush_work_sync while holding locks 2012-09-13 14:58:54 -04:00
hisax ISDN: Add check for usb_alloc_urb() result 2012-07-18 09:40:54 -07:00
hysdn isdn/hysdn: Convert to kstrtoul_from_user 2012-04-15 03:23:31 -04:00
i4l TTY pull request for 3.5-rc1 2012-05-22 16:12:24 -07: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 mISDN: Fix wrong usage of flush_work_sync while holding locks 2012-09-13 14:58:54 -04: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