Merge branch 'next' into for-linus
authorJames Morris <jmorris@namei.org>
Thu, 25 Dec 2008 00:40:09 +0000 (11:40 +1100)
committerJames Morris <jmorris@namei.org>
Thu, 25 Dec 2008 00:40:09 +0000 (11:40 +1100)
commitcbacc2c7f066a1e01b33b0e27ae5efbf534bc2db
tree90d1093131d2a3543a8b3b1f3364e7c6f4081a93
parent4a6908a3a050aacc9c3a2f36b276b46c0629ad91
parent74192246910ff4fb95309ba1a683215644beeb62
Merge branch 'next' into for-linus
18 files changed:
Documentation/kernel-parameters.txt
arch/mips/kernel/vpe.c
arch/um/drivers/mconsole_kern.c
fs/9p/fid.c
fs/9p/vfs_inode.c
fs/exec.c
fs/exportfs/expfs.c
fs/ext4/balloc.c
fs/fcntl.c
fs/proc/base.c
include/linux/audit.h
include/linux/fs.h
kernel/auditsc.c
kernel/cgroup.c
kernel/fork.c
kernel/sched.c
mm/migrate.c
net/socket.c