Merge branch 'linus' into cpus4096-for-linus
commiteb6a12c2428d21a9f3e0f1a50e927d5fd80fc3d0
authorIngo Molnar <mingo@elte.hu>
Mon, 21 Jul 2008 15:19:50 +0000 (21 17:19 +0200)
committerIngo Molnar <mingo@elte.hu>
Mon, 21 Jul 2008 15:19:50 +0000 (21 17:19 +0200)
tree5ac6f43899648abeab1d43aad3107f664e7f13d5
parentc4762aba0b1f72659aae9ce37b772ca8bd8f06f4
parent14b395e35d1afdd8019d11b92e28041fad591b71
Merge branch 'linus' into cpus4096-for-linus

Conflicts:

net/sunrpc/svc.c

Signed-off-by: Ingo Molnar <mingo@elte.hu>
net/core/dev.c
net/iucv/iucv.c
net/sunrpc/svc.c