tree f05cb784406c0a0cb24d291e515dfcaa3e4b6464
parent ea2ba7dc3dd3f85034e6da6abacc813d723a2ad5
author Gennady Sharapov <Gennady.V.Sharapov@intel.com> 1136710892 -0800
committer Linus Torvalds <torvalds@g5.osdl.org> 1136780019 -0800

[PATCH] uml: merge trap_user.c and trap_kern.c

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

This joins trap_user.c and trap_kernel.c files.

Signed-off-by: Gennady Sharapov <Gennady.V.Sharapov@intel.com>
Signed-off-by: Jeff Dike <jdike@addtoit.com>
Cc: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>