diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-06-25 06:16:51 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-06-25 06:16:51 -0400 |
| commit | d02859ecb321c8c0f74cb9bbe3f51a59e58822b0 (patch) | |
| tree | 05dd5bdc55081c0a90bf0afc35c07d0d6e25d015 /arch/ia64/dig | |
| parent | a987b16cc6123af2c9414032701bab5f73c54c89 (diff) | |
| parent | 543cf4cb3fe6f6cae3651ba918b9c56200b257d0 (diff) | |
Merge commit 'v2.6.26-rc8' into x86/xen
Conflicts:
arch/x86/xen/enlighten.c
arch/x86/xen/mmu.c
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/ia64/dig')
0 files changed, 0 insertions, 0 deletions