From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Mon, 13 Nov 2006 16:14:13 +0000 (-0800)
Subject: Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
X-Git-Tag: v2.6.19-rc6~31
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=ea991f06d851d58268eac6ce5c2152397757c958;p=linux-2.6-omap-h63xx.git

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.
---

ea991f06d851d58268eac6ce5c2152397757c958