Ingo Molnar eb6a12c242 Merge branch 'linus' into cpus4096-for-linus ... Conflicts: net/sunrpc/svc.c Signed-off-by: Ingo Molnar <mingo@elte.hu>		2008-07-21 17:19:50 +02:00
..
af_iucv.c	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6	2008-07-18 02:39:39 -07:00
iucv.c	Merge branch 'linus' into cpus4096-for-linus	2008-07-21 17:19:50 +02:00
Kconfig	[AF_IUCV]: Improve description of IUCV and AFIUCV configuration options.	2007-07-14 19:03:00 -07:00
Makefile