Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-fixes
[pandora-kernel.git] / fs / gfs2 / rgrp.c
diff --cc fs/gfs2/rgrp.c
Simple merge