| commit | d93fe1a144c1a4312972bedbefc2213aa8b88612 | [log] [tgz] |
|---|---|---|
| author | Ursula Braun <ubraun@linux.vnet.ibm.com> | Thu Apr 23 06:37:16 2009 -0700 |
| committer | David S. Miller <davem@davemloft.net> | Thu Apr 23 06:37:16 2009 -0700 |
| tree | 5b79f04234ecc96245a95a1191d677d03d6955b3 | |
| parent | 5802b140ed52957ad150eaf40239a95f5f45fbd3 [diff] |
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>