diff options
| author | Roland Dreier <[email protected]> | 2009-03-26 23:25:49 +0000 |
|---|---|---|
| committer | Linus Torvalds <[email protected]> | 2009-03-27 00:00:25 +0000 |
| commit | 7c757eb9f804782fb39d0ae2c1a88ffb9309138e (patch) | |
| tree | 99caa29ce033e4ba8b14687022d5da4de3b76232 /net/unix/af_unix.c | |
| parent | sparc64: Fix build of timer_interrupt(). (diff) | |
| download | kernel-7c757eb9f804782fb39d0ae2c1a88ffb9309138e.tar.gz kernel-7c757eb9f804782fb39d0ae2c1a88ffb9309138e.zip | |
RDMA/nes: Fix mis-merge
When net-next and infiniband were merged upstream, each branch deleted
one of a pair of adjacent lines from nes_nic.c, but when Linus fixed the
conflict up, he brought back both of the lines. Fix up to the intended
final tree state.
Signed-off-by: Roland Dreier <[email protected]>
Acked-by: David S. Miller <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>
Diffstat (limited to 'net/unix/af_unix.c')
0 files changed, 0 insertions, 0 deletions