Merge to 2.1.38.

IMPORTANT NOTE:  I could not figure out what information is the
one that should be used for the following files (ie, those
that were in our tree, or those that came from Linus' patch),
please, check these:

include/asm-mips/jazz.h
include/asm-mips/jazzdma.h
include/asm-mips/ioctls.h

1 files changed, 1 insertions, 1 deletions

diff --git a/net/ipv4/proc.c b/net/ipv4/proc.c
index e3b41e2ad..1184c9f41 100644
--- a/net/ipv4/proc.c
+++ b/net/ipv4/proc.c
@@ -77,7 +77,7 @@ get__netinfo(struct proto *pro, char *buffer, int format, char **start, off_t of
  *	This was very pretty but didn't work when a socket is destroyed
  *	at the wrong moment (eg a syn recv socket getting a reset), or
  *	a memory timer destroy. Instead of playing with timers we just
- *	concede defeat and cli().
+ *	concede defeat and do a start_bh_atomic().
  */
 	SOCKHASH_LOCK();
 	sp = pro->sklist_next;