Merge kroah.com:/home/greg/linux/BK/bleeding_edge-2.5

author Greg Kroah-Hartman <greg@kroah.com>

Wed, 17 Jul 2002 03:16:22 +0000 (20:16 -0700)

committer Greg Kroah-Hartman <greg@kroah.com>

Wed, 17 Jul 2002 03:16:22 +0000 (20:16 -0700)
author Greg Kroah-Hartman <greg@kroah.com>
Wed, 17 Jul 2002 03:16:22 +0000 (20:16 -0700)
committer Greg Kroah-Hartman <greg@kroah.com>
Wed, 17 Jul 2002 03:16:22 +0000 (20:16 -0700)
diff --cc ipc/msg.c
Simple merge
diff --cc ipc/sem.c
Simple merge
author	Greg Kroah-Hartman <greg@kroah.com>
	Wed, 17 Jul 2002 03:16:22 +0000 (20:16 -0700)
committer	Greg Kroah-Hartman <greg@kroah.com>
	Wed, 17 Jul 2002 03:16:22 +0000 (20:16 -0700)
		1	2
ipc/msg.c	patch \|	diff1 \|	diff2 \|	blob \| history
ipc/sem.c	patch \|	diff1 \|	diff2 \|	blob \| history