]> git.baikalelectronics.ru Git - kernel.git/commit
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Sun, 4 Mar 2007 21:16:49 +0000 (13:16 -0800)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Sun, 4 Mar 2007 21:16:49 +0000 (13:16 -0800)
commit48aa2d6700fcfa2bcb8e1ece683dd7048150dce8
treeaaee636d71492f36fdef9977488c85a64063f8c4
parent3de2c8abaa393b9389b2a804c453d7483c686d3f
parentc4378604e4e9b3b5ce5db79caedbebd83f43e49c
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