Merge branch 'for-linus' of git://neil.brown.name/md
[pandora-kernel.git] / fs / gfs2 / quota.c
diff --cc fs/gfs2/quota.c
Simple merge