diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-06-25 12:16:51 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-06-25 12:16:51 +0200 |
| commit | d02859ecb321c8c0f74cb9bbe3f51a59e58822b0 (patch) | |
| tree | 05dd5bdc55081c0a90bf0afc35c07d0d6e25d015 /fs/ocfs2/suballoc.c | |
| parent | xen: don't drop NX bit (diff) | |
| parent | Linux 2.6.26-rc8 (diff) | |
| download | linux-d02859ecb321c8c0f74cb9bbe3f51a59e58822b0.tar.xz linux-d02859ecb321c8c0f74cb9bbe3f51a59e58822b0.zip | |
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 'fs/ocfs2/suballoc.c')
0 files changed, 0 insertions, 0 deletions