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

[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