]> err.no Git - linux-2.6/commit
projects / linux-2.6 / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 175f9c1) | patch
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)
commitfb65a7c091529bfffb1262515252c0d0f6241c5c
tree021a043df0e0d328c509c0e8fb74429cbce006c7tree | snapshot
parent175f9c1bba9b825d22b142d183c9e175488b260ccommit | diff
iucv: Fix bad merging.

Noticed by Stephen Rothwell.

Signed-off-by: David S. Miller <davem@davemloft.net>
net/iucv/iucv.c diff | blob | history
Linux 2.6 source tree