]> err.no Git - linux-2.6/commit
Merge commit 'v2.6.26-rc8' into x86/xen
authorIngo Molnar <mingo@elte.hu>
Wed, 25 Jun 2008 10:16:51 +0000 (12:16 +0200)
committerIngo Molnar <mingo@elte.hu>
Wed, 25 Jun 2008 10:16:51 +0000 (12:16 +0200)
commitd02859ecb321c8c0f74cb9bbe3f51a59e58822b0
tree05dd5bdc55081c0a90bf0afc35c07d0d6e25d015
parenta987b16cc6123af2c9414032701bab5f73c54c89
parent543cf4cb3fe6f6cae3651ba918b9c56200b257d0
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>
arch/x86/xen/Kconfig
arch/x86/xen/time.c