Merge branch 'master'; commit 'v2.6.38-rc7' into next
James Morris [Mon, 7 Mar 2011 23:55:06 +0000 (10:55 +1100)]
1  2 
fs/file_table.c
fs/open.c
include/linux/fs.h
security/security.c

diff --cc fs/file_table.c
Simple merge
diff --cc fs/open.c
Simple merge
Simple merge
Simple merge