tree 021a043df0e0d328c509c0e8fb74429cbce006c7
parent 175f9c1bba9b825d22b142d183c9e175488b260c
author David S. Miller <davem@davemloft.net> 1216574324 -0700
committer David S. Miller <davem@davemloft.net> 1216574324 -0700

iucv: Fix bad merging.

Noticed by Stephen Rothwell.

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