tree 649346d2333865ccd4bb4d560ceb50c39139c5c2
parent 858ba94499b4f48e9eb0be7cf0092f1ea9460fef
author Al Viro <viro@ftp.linux.org.uk> 1313694199 +0100
committer Richard Weinberger <richard@nod.at> 1320239691 +0100

um: merge arch/um/sys-{i386,x86_64}

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Richard Weinberger <richard@nod.at>