David S. Miller fb65a7c091 iucv: Fix bad merging. ... Noticed by Stephen Rothwell. Signed-off-by: David S. Miller <davem@davemloft.net>		2008-07-20 10:18:44 -07: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	iucv: Fix bad merging.	2008-07-20 10:18:44 -07:00
Kconfig
Makefile