From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Sat, 30 Jun 2007 04:29:57 +0000 (-0700)
Subject: Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
X-Git-Tag: v2.6.22-rc7~12
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=2d408b42ed0a287c64a94b48e24c6bfa95035019;p=linux-2.6-omap-h63xx.git

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:
  [IRDA]: fix printk format
  [NETPOLL] netconsole: fix soft lockup when removing module
  [NETPOLL]: tx lock deadlock fix
  SCTP: lock_sock_nested in sctp_sock_migrate
  SCTP: Fix sctp_getsockopt_get_peer_addrs
  SCTP: update sctp_getsockopt helpers to allow oversized buffers
---

2d408b42ed0a287c64a94b48e24c6bfa95035019