]> git.baikalelectronics.ru Git - kernel.git/commit
iucv: Fix bad merging.
authorDavid S. Miller <davem@davemloft.net>
Sun, 20 Jul 2008 17:18:44 +0000 (10:18 -0700)
committerDavid S. Miller <davem@davemloft.net>
Sun, 20 Jul 2008 17:18:44 +0000 (10:18 -0700)
commit0b6ac7e98105562e5fd0696867f5a599a9dbceb6
tree021a043df0e0d328c509c0e8fb74429cbce006c7
parentbf44dad81f36b127077197b581fd8be6bd518e38
iucv: Fix bad merging.

Noticed by Stephen Rothwell.

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