[PATCH] uml: merge mem_user.c and mem.c
authorJeff Dike <jdike@addtoit.com>
Sat, 17 Sep 2005 02:27:51 +0000 (19:27 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Sat, 17 Sep 2005 18:50:00 +0000 (11:50 -0700)
commit114069f7384c15a7a9f8d3e333caf4d470dfe520
tree0bb25d2df50954e14bcd509dd585ec44bfbcff81
parent0f80bc85c587e8fdeecece4f294a47eca4922ea2
[PATCH] uml: merge mem_user.c and mem.c

The serial UML OS-abstraction layer patch (um/kernel dir).

This joins mem_user.c and mem.c files.

Signed-off-by: Gennady Sharapov <Gennady.V.Sharapov@intel.com>
Signed-off-by: Jeff Dike <jdike@addtoit.com>
Cc: Paolo Giarrusso <blaisorblade@yahoo.it>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
arch/um/kernel/Makefile
arch/um/kernel/mem.c
arch/um/kernel/mem_user.c [deleted file]