iucv: Fix bad merging.
commitfb65a7c091529bfffb1262515252c0d0f6241c5c
authorDavid S. Miller <davem@davemloft.net>
Sun, 20 Jul 2008 17:18:44 +0000 (20 10:18 -0700)
committerDavid S. Miller <davem@davemloft.net>
Sun, 20 Jul 2008 17:18:44 +0000 (20 10:18 -0700)
tree021a043df0e0d328c509c0e8fb74429cbce006c7
parent175f9c1bba9b825d22b142d183c9e175488b260c
iucv: Fix bad merging.

Noticed by Stephen Rothwell.

Signed-off-by: David S. Miller <davem@davemloft.net>
net/iucv/iucv.c