Merge master.kernel.org:/pub/scm/linux/kernel/git/steve/gfs2-2.6-nmw