Merge branch 'next' into for-linus
authorJames Morris <jmorris@namei.org>
Tue, 15 Mar 2011 22:41:17 +0000 (09:41 +1100)
committerJames Morris <jmorris@namei.org>
Tue, 15 Mar 2011 22:41:17 +0000 (09:41 +1100)
commita002951c97ff8da49938c982a4c236bf2fafdc9f
treed43e7885ea7376df0a47a0fc8ceca66dc5bfa357
parent521cb40b0c44418a4fd36dc633f575813d59a43d
parentc151694b2c48d956ac8c8c59c6927f89cc29ef70
Merge branch 'next' into for-linus
fs/btrfs/inode.c
fs/jfs/namei.c
fs/open.c
fs/proc/proc_sysctl.c
kernel/sysctl.c