David S. Miller 14ebaf81e1 x25: Fix sleep from timer on socket destroy. ... If socket destuction gets delayed to a timer, we try to lock_sock() from that timer which won't work. Use bh_lock_sock() in that case. Signed-off-by: David S. Miller <davem@davemloft.net> Tested-by: Ingo Molnar <mingo@elte.hu>		2009-06-16 05:40:30 -07:00
..
acpi	Merge branch 'drm-intel-next' of git://git.kernel.org/pub/scm/linux/kernel/git/anholt/drm-intel	2009-04-28 17:21:20 -07:00
asm-generic	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6	2009-06-15 03:02:23 -07:00
crypto
drm	Merge branch 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6	2009-06-12 18:09:18 -07:00
keys
linux	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6	2009-06-15 03:02:23 -07:00
math-emu
media	V4L/DVB (11381): ivtv/cx18: remove VIDIOC_INT_S_AUDIO_ROUTING debug support.	2009-04-06 21:44:28 -03:00
mtd	make MTD headers use strict integer types	2009-03-26 18:14:17 +01:00
net	x25: Fix sleep from timer on socket destroy.	2009-06-16 05:40:30 -07:00
pcmcia
rdma	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6	2009-03-26 15:54:36 -07:00
rxrpc
scsi	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6	2009-06-15 03:02:23 -07:00
sound	Merge branch 'topic/pcm-jiffies-check' into for-linus	2009-06-10 07:26:41 +02:00
trace	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6	2009-06-15 03:02:23 -07:00
video	fb: add support of LCD display controller on pxa168/910 (base layer)	2009-06-13 00:09:09 +08:00
xen	Merge branches 'for-linus/xen/dev-evtchn', 'for-linus/xen/xenbus', 'for-linus/xen/xenfs' and 'for-linus/xen/sys-hypervisor' into for-linus/xen/master	2009-03-30 10:00:45 -07:00
Kbuild	xen: export ioctl headers to userspace	2009-03-30 09:26:49 -07:00