Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Fri, 22 Jun 2007 18:10:05 +0000 (11:10 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Fri, 22 Jun 2007 18:10:05 +0000 (11:10 -0700)
commite2f90a9141d9e1a4cd0e79716919a5fa39684ae9
tree2a61c5286b7e0d83e2c6a62d9b39e6ab33b1ff08
parent0864a4e201b1ea442f4c8b887418a29f67e24d30
parent19e6454ca778e11e81497bd87c930dc0defd03d7
Merge branch 'master' of /linux/kernel/git/davem/net-2.6

* 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6:
  [AF_RXRPC]: Return the number of bytes buffered in rxrpc_send_data()
  [IPVS]: Fix state variable on failure to start ipvs threads
  [XFRM]: Fix MTU calculation for non-ESP SAs