Heiko Carstens 8b122efd13 iucv: Fix mismerge again. %!s(int64=16) %!d(string=hai) anos
..
Kconfig da7de31cc5 [AF_IUCV]: Improve description of IUCV and AFIUCV configuration options. %!s(int64=18) %!d(string=hai) anos
Makefile eac3731bd0 [S390]: Add AF_IUCV socket support %!s(int64=18) %!d(string=hai) anos
af_iucv.c 49997d7515 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6 %!s(int64=17) %!d(string=hai) anos
iucv.c 8b122efd13 iucv: Fix mismerge again. %!s(int64=16) %!d(string=hai) anos