Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 22 Dec 2008 18:12:54 +0000 (10:12 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 22 Dec 2008 18:12:54 +0000 (10:12 -0800)
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6:
  ppp: fix segfaults introduced by netdev_priv changes
  net: Fix module refcount leak in kernel_accept()


Trivial merge