| commit | e2f90a9141d9e1a4cd0e79716919a5fa39684ae9 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | Fri Jun 22 11:10:05 2007 -0700 |
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | Fri Jun 22 11:10:05 2007 -0700 |
| tree | 2a61c5286b7e0d83e2c6a62d9b39e6ab33b1ff08 | |
| parent | 0864a4e201b1ea442f4c8b887418a29f67e24d30 [diff] | |
| parent | 19e6454ca778e11e81497bd87c930dc0defd03d7 [diff] |
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