From: Linus Torvalds Date: Sun, 4 Mar 2007 21:16:49 +0000 (-0800) Subject: Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 X-Git-Tag: v2.6.21-rc3~101 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=6d04e3b04b6ab569cabeb5ca28ad1be11777e895;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: [VLAN]: Avoid a 4-order allocation. [HDLC] Fix dev->header_cache_update having a random value. [NetLabel]: Verify sensitivity level has a valid CIPSO mapping [PPPOE]: Key connections properly on local device. [AF_UNIX]: Test against sk_max_ack_backlog properly. [NET]: Fix bugs in "Whether sock accept queue is full" checking --- 6d04e3b04b6ab569cabeb5ca28ad1be11777e895