Merge git://git./linux/kernel/git/steve/gfs2-2.6-fixes
* git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-fixes:
[GFS2] Fix bz 229873, alternate test: assertion "!ip->i_inode.i_mapping->nrpages" failed
[GFS2] build fix
[GFS2] go_drop_bh is never used, so remove it
[GFS2] Remove unused variable
[GFS2] Fix bz 229831, lookup returns wrong inode
[GFS2] Fix bz 230143, incorrect flushing of rgrps
[GFS2] pass formal ino in do_filldir_main
[DLM] fs/dlm/user.c should #include "user.h"
[GFS2] fix hangup when multiple processes are trying to write to the same file
[GFS2] NFS filehandle check
[GFS2] add newline to printk message
[GFS2] fix locking mistake