diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-18 23:01:04 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-18 23:01:04 +0200 |
| commit | 9553e11325e3d44a8c8a1428c7e5f146f1cc7238 (patch) | |
| tree | 98a95631f6b810436eca57c242ade769906200fa /net/sctp/sm_make_chunk.c | |
| parent | 453c1404c5273a30d715e5a83372a78cff70b6d9 (diff) | |
| parent | 7019cc2dd6fafcdc6b104005482dc910dcdbb797 (diff) | |
Merge branch 'x86/uv' into x86/x2apic
Conflicts:
arch/x86/kernel/Makefile
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'net/sctp/sm_make_chunk.c')
0 files changed, 0 insertions, 0 deletions