Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

This commit is contained in:
David S. Miller 2011-03-15 15:15:17 -07:00
commit c337ffb68e
13 changed files with 70 additions and 45 deletions

View file

@ -1124,7 +1124,7 @@ restart:
/* Latch our state.
It is tricky place. We need to grab write lock and cannot
It is tricky place. We need to grab our state lock and cannot
drop lock on peer. It is dangerous because deadlock is
possible. Connect to self case and simultaneous
attempt to connect are eliminated by checking socket