projects / platform / upstream / kernel-adaptation-pc.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 221a09d 9abbffe)
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)
commit137b529e4df7b9cd6b235654a3f1a8f280e3463d
tree30a84ff048ac3e42a767ffa9c6da2b81358baf7atree | snapshot
parent221a09d5c4cb8384d9be74db60f37a5752675255commit | diff
parent9abbffee861c6c56fce27e4eda96a10cf0de0f84commit | diff
Merge /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
Domain: System / Uncategorized;