From: Linus Torvalds 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: firefly_0821_release~31522^2~20^2~137 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=ea991f06d851d58268eac6ce5c2152397757c958;p=firefly-linux-kernel-4.4.55.git Merge /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