diff options
author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2008-10-21 15:52:04 +1100 |
---|---|---|
committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2008-10-21 15:52:04 +1100 |
commit | a02efb906d12c9d4eb2ab7c59049ba9545e5412d (patch) | |
tree | bf1f6467978ec63a22f42299ecac2ee7f7e73336 /drivers/char/hvc_xen.c | |
parent | 84dfcb4b318463cd4883b6a19937824f49aee564 (diff) | |
parent | 2515ddc6db8eb49a79f0fe5e67ff09ac7c81eab4 (diff) | |
download | kernel_samsung_smdk4412-a02efb906d12c9d4eb2ab7c59049ba9545e5412d.zip kernel_samsung_smdk4412-a02efb906d12c9d4eb2ab7c59049ba9545e5412d.tar.gz kernel_samsung_smdk4412-a02efb906d12c9d4eb2ab7c59049ba9545e5412d.tar.bz2 |
Merge commit 'origin' into master
Manual merge of:
arch/powerpc/Kconfig
arch/powerpc/include/asm/page.h
Diffstat (limited to 'drivers/char/hvc_xen.c')
0 files changed, 0 insertions, 0 deletions