Merge branch 'next' into for-linus
James Morris [Tue, 15 Mar 2011 22:41:17 +0000 (09:41 +1100)]
1  2 
fs/btrfs/inode.c
fs/jfs/namei.c
fs/open.c
fs/proc/proc_sysctl.c
kernel/sysctl.c

Simple merge
diff --cc fs/jfs/namei.c
Simple merge
diff --cc fs/open.c
Simple merge
Simple merge
diff --cc kernel/sysctl.c
Simple merge