Merge branch 'master'; commit 'v2.6.38-rc7' into next

diff --cc fs/file_table.c
Simple merge

diff --cc fs/open.c
Simple merge

diff --cc include/linux/fs.h
Simple merge

diff --cc security/security.c
Simple merge