diff options
| author | Ursula Braun <ubraun@linux.vnet.ibm.com> | 2009-04-23 15:37:16 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-04-23 15:37:16 +0200 |
| commit | d93fe1a144c1a4312972bedbefc2213aa8b88612 (patch) | |
| tree | 5b79f04234ecc96245a95a1191d677d03d6955b3 /drivers/net/8390p.c | |
| parent | Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/ne... (diff) | |
| download | linux-d93fe1a144c1a4312972bedbefc2213aa8b88612.tar.xz linux-d93fe1a144c1a4312972bedbefc2213aa8b88612.zip | |
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>
Diffstat (limited to 'drivers/net/8390p.c')
0 files changed, 0 insertions, 0 deletions