aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/include/asm/page.h
diff options
context:
space:
mode:
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>2009-01-28 01:15:34 -0500
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>2009-01-28 01:15:34 -0500
commit6469c92e0a4879e57bccbbacb2b724672a4fa8fb (patch)
tree65b3377bdea03342f64f5cd414d61824ff2cf354 /arch/x86/include/asm/page.h
parent0411648e445d850ded24aba98f1774c417bf5658 (diff)
parent0b21bcd5b52779be0c18a6c201ae8f060d3b2bf2 (diff)
Merge commit 'jwb/jwb-merge' into merge
Manual merge of: arch/powerpc/configs/44x/warp_defconfig
Diffstat (limited to 'arch/x86/include/asm/page.h')
0 files changed, 0 insertions, 0 deletions