Merge branch 'bugfixes'

diff --cc fs/nfs/pagelist.c
Simple merge

diff --cc fs/nfs/write.c
Simple merge

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