| commit | 2d408b42ed0a287c64a94b48e24c6bfa95035019 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | Fri Jun 29 21:29:57 2007 -0700 |
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | Fri Jun 29 21:29:57 2007 -0700 |
| tree | dba39d735ce0051deadfd4d887637de33dfe842c | |
| parent | fde937d826e43c9fe7fecc98b6f3da7188e76930 [diff] | |
| parent | 5f0212174db33828f8bddcff501b73d2bc734f72 [diff] |
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