tree b28883e47171c16e69178e2b9ccaad9985778a9e
parent 460edb3cd06865ffb231eb694b567daec3113210
parent cd46171c7297739dc7e46d885862e98023eab9c7
author Linus Torvalds <torvalds@woody.linux-foundation.org> 1190317367 -0700
committer Linus Torvalds <torvalds@woody.linux-foundation.org> 1190317367 -0700

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

* 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6:
  [BNX2]: Add PHY workaround for 5709 A1.
  [PPP] L2TP: Fix skb handling in pppol2tp_xmit
  [PPP] L2TP: Fix skb handling in pppol2tp_recv_core
  [PPP] L2TP: Disallow non-UDP datagram sockets
  [PPP] pppoe: Fix double-free on skb after transmit failure
  [PKT_SCHED]: Fix 'SFQ qdisc crashes with limit of 2 packets'
  [NETFILTER]: MAINTAINERS update
  [NETFILTER]: nfnetlink_log: fix sending of multipart messages