tree 30a84ff048ac3e42a767ffa9c6da2b81358baf7a
parent 221a09d5c4cb8384d9be74db60f37a5752675255
parent 9abbffee861c6c56fce27e4eda96a10cf0de0f84
author Linus Torvalds <torvalds@woody.osdl.org> 1164562960 -0800
committer Linus Torvalds <torvalds@woody.osdl.org> 1164562960 -0800

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