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

2011-07-05 23:23:37 -07:00
parent 7329f0d58d 712ae51afd
commit e12fe68ce3
305 changed files with 2767 additions and 1693 deletions
--- a/include/net/sock.h
+++ b/include/net/sock.h
@@ -179,7 +179,6 @@ struct sock_common {
  *	@sk_dst_cache: destination cache
  *	@sk_dst_lock: destination cache lock
  *	@sk_policy: flow policy
-  *	@sk_rmem_alloc: receive queue bytes committed
  *	@sk_receive_queue: incoming packets
  *	@sk_wmem_alloc: transmit queue bytes committed
  *	@sk_write_queue: Packet sending queue