Heiko Carstens 8b122efd13 iucv: Fix mismerge again. 16 éve
..
Kconfig da7de31cc5 [AF_IUCV]: Improve description of IUCV and AFIUCV configuration options. 18 éve
Makefile eac3731bd0 [S390]: Add AF_IUCV socket support 18 éve
af_iucv.c 49997d7515 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6 17 éve
iucv.c 8b122efd13 iucv: Fix mismerge again. 16 éve