| commit | eb8cc01d686b1f24c231513130c4556925712428 | [log] [tgz] |
|---|---|---|
| author | Ingo Molnar <mingo@elte.hu> | Wed Jun 25 12:28:14 2008 +0200 |
| committer | Ingo Molnar <mingo@elte.hu> | Wed Jun 25 12:28:14 2008 +0200 |
| tree | 2d16a8892834ff66d3936f4f10e099a63b3725e9 | |
| parent | fece486db13f084acefcb52ed0ce8bb8bccc7a57 [diff] | |
| parent | 543cf4cb3fe6f6cae3651ba918b9c56200b257d0 [diff] |
Merge branch 'linus' into tracing/immediates Conflicts: net/core/dev.c Signed-off-by: Ingo Molnar <mingo@elte.hu>