tree 604d95410caa54c60abcfb018bc62f4fde0398bc
parent 245d95a423664761d9399656098523db6988e9cc
parent 19bb3506e27096eea5f7b71b89621ad1203ed318
author Linus Torvalds <torvalds@woody.linux-foundation.org> 1176853892 -0700
committer Linus Torvalds <torvalds@woody.linux-foundation.org> 1176853892 -0700

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:
  [BRIDGE]: Unaligned access when comparing ethernet addresses
  [SCTP]: Unmap v4mapped addresses during SCTP_BINDX_REM_ADDR operation.
  [SCTP]: Fix assertion (!atomic_read(&sk->sk_rmem_alloc)) failed message
  [NET]: Set a separate lockdep class for neighbour table's proxy_queue
  [NET]: Fix UDP checksum issue in net poll mode.
  [KEY]: Fix conversion between IPSEC_MODE_xxx and XFRM_MODE_xxx.
  [NET]: Get rid of alloc_skb_from_cache