]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: ebb9d21 14637c0)
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
authorLinus Torvalds <torvalds@woody.osdl.org>
Sun, 26 Nov 2006 17:42:40 +0000 (09:42 -0800)
committerLinus Torvalds <torvalds@woody.osdl.org>
Sun, 26 Nov 2006 17:42:40 +0000 (09:42 -0800)
commit2b995e4668148aa88fb9f283572b5cca0b7a2d4c
tree30a84ff048ac3e42a767ffa9c6da2b81358baf7atree | snapshot
parentebb9d213964b84a6a5567ce7c22fbbee72a9f27dcommit | diff
parent14637c0a9edbb2b5e189d1986435a1892cafd6e7commit | diff
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:
  [XFRM] STATE: Fix to respond error to get operation if no matching entry exists.
  [NET]: Re-fix of doc-comment in sock.h
  [6PACK]: Masking bug in 6pack driver.
  [NET]: Fix kfifo_alloc() error check.
  [UDP]: Make udp_encap_rcv use pskb_may_pull
  [NETFILTER]: H.323 conntrack: fix crash with CONFIG_IP_NF_CT_ACCT
Linux Kernel Source Tree.