]> pilppa.com Git - linux-2.6-omap-h63xx.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)
commitea991f06d851d58268eac6ce5c2152397757c958
treee789e2d8284cf38aecea4f4a0fd0a4c52157d934
parent170926993a320cd7b53c388e6ffc759de4fac472
parentbb831eb2027c12a740ad4e4ad78f2a0e841ae808
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.