Merge master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6 into next
[linux-2.6] / arch / um / sys-x86_64 / mem.c
2005-04-16  Linus TorvaldsLinux-2.6.12-rc2 v2.6.12-rc2