| commit | eb6a12c2428d21a9f3e0f1a50e927d5fd80fc3d0 | [log] [tgz] |
|---|---|---|
| author | Ingo Molnar <mingo@elte.hu> | Mon Jul 21 17:19:50 2008 +0200 |
| committer | Ingo Molnar <mingo@elte.hu> | Mon Jul 21 17:19:50 2008 +0200 |
| tree | 5ac6f43899648abeab1d43aad3107f664e7f13d5 | |
| parent | c4762aba0b1f72659aae9ce37b772ca8bd8f06f4 [diff] | |
| parent | 14b395e35d1afdd8019d11b92e28041fad591b71 [diff] |
Merge branch 'linus' into cpus4096-for-linus Conflicts: net/sunrpc/svc.c Signed-off-by: Ingo Molnar <mingo@elte.hu>