Merge branch 'd_real' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/vfs...

diff --cc Documentation/filesystems/Locking
Simple merge

diff --cc Documentation/filesystems/vfs.txt
Simple merge

diff --cc drivers/gpu/drm/omapdrm/omap_gem.c
Simple merge

diff --cc fs/dcache.c
Simple merge

diff --cc fs/namespace.c
Simple merge

diff --cc mm/hugetlb.c
Simple merge