]> git.baikalelectronics.ru Git - kernel.git/commit
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
authorLinus Torvalds <torvalds@g5.osdl.org>
Mon, 13 Nov 2006 16:14:13 +0000 (08:14 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Mon, 13 Nov 2006 16:14:13 +0000 (08:14 -0800)
commit1e1b7833bbb35b1e7f7e50337b0040f1e7f75fea
treee789e2d8284cf38aecea4f4a0fd0a4c52157d934
parent08529e3fda98456f864770ce88aad0ebc6860530
parent727cb4839ae1fd03396da6f9506477fa4ca52e46
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

* master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6:
  [IPVS]: More endianness fixed.
  [IPVS]: Compile fix for annotations in userland.