| commit | eb6a12c2428d21a9f3e0f1a50e927d5fd80fc3d0 | |
| author | Ingo Molnar <mingo@elte.hu> | |
| Mon, 21 Jul 2008 15:19:50 +0000 (21 17:19 +0200) | ||
| committer | Ingo Molnar <mingo@elte.hu> | |
| Mon, 21 Jul 2008 15:19:50 +0000 (21 17:19 +0200) | ||
| tree | 5ac6f43899648abeab1d43aad3107f664e7f13d5 | treesnapshot (tar.gz zip) |
| parent | c4762aba0b1f72659aae9ce37b772ca8bd8f06f4 | commitdiff |
| parent | 14b395e35d1afdd8019d11b92e28041fad591b71 | commitdiff |
Merge branch 'linus' into cpus4096-for-linus
Conflicts:
net/sunrpc/svc.c
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Conflicts:
net/sunrpc/svc.c
Signed-off-by: Ingo Molnar <mingo@elte.hu>
| net/core/dev.c | diff1 | diff2 | blobhistory |
| net/iucv/iucv.c | diff1 | diff2 | blobhistory |
| net/sunrpc/svc.c | diff1 | diff2 | blobhistory |