diff options
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-06-30 06:29:57 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-06-30 06:29:57 +0200 |
commit | 2d408b42ed0a287c64a94b48e24c6bfa95035019 (patch) | |
tree | dba39d735ce0051deadfd4d887637de33dfe842c /arch | |
parent | Fix VDSO gettimeofday() when called with NULL struct timeval. (diff) | |
parent | [IRDA]: fix printk format (diff) | |
download | linux-2d408b42ed0a287c64a94b48e24c6bfa95035019.tar.xz linux-2d408b42ed0a287c64a94b48e24c6bfa95035019.zip |
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
Diffstat (limited to 'arch')
0 files changed, 0 insertions, 0 deletions