From: Ursula Braun <ubraun@linux.vnet.ibm.com>
Date: Thu, 23 Apr 2009 13:37:16 +0000 (-0700)
Subject: af_iucv: Fix merge.
X-Git-Tag: v2.6.31-rc1~330^2~570
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d93fe1a144c1a4312972bedbefc2213aa8b88612;p=pandora-kernel.git

af_iucv: Fix merge.

From: Ursula Braun <ubraun@linux.vnet.ibm.com>

net/iucv/af_iucv.c in net-next-2.6 is almost correct. 4 lines should
still be deleted. These are the remaining changes:

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

Reading git-diff-tree failed