Merge branch 'master'

diff --cc Documentation/ioctl-number.txt
Simple merge

diff --cc fs/Kconfig
Simple merge

diff --cc fs/Makefile
Simple merge

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

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

diff --cc kernel/printk.c
Simple merge

diff --cc mm/filemap.c
Simple merge

diff --cc mm/readahead.c
Simple merge