android_kernel_samsung_msm8976/net/iucv
Ingo Molnar 82638844d9 Merge branch 'linus' into cpus4096
Conflicts:

	arch/x86/xen/smp.c
	kernel/sched_rt.c
	net/iucv/iucv.c

Signed-off-by: Ingo Molnar <mingo@elte.hu>
2008-07-16 00:29:07 +02:00
..
af_iucv.c [S390] Cleanup iucv printk messages. 2008-07-14 10:02:20 +02:00
iucv.c Merge branch 'linus' into cpus4096 2008-07-16 00:29:07 +02:00
Kconfig [AF_IUCV]: Improve description of IUCV and AFIUCV configuration options. 2007-07-14 19:03:00 -07:00
Makefile [S390]: Add AF_IUCV socket support 2007-02-08 13:51:54 -08:00