]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commitf9ee03ad0e9993c23a594e1d748c499f7ebf1cfe
tree2a61c5286b7e0d83e2c6a62d9b39e6ab33b1ff08
parentbaeecb804ce2026c5e255353f86e28f82b820a32
parent58f1644490793b0fc6752745ac34cf899b767b9a
Merge branch 'master' of master.kernel.org:/pub/scm/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