From: Linus Torvalds Date: Wed, 7 Jan 2009 19:58:06 +0000 (-0800) Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-fixes X-Git-Tag: v2.6.29-rc1~193 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=0d6326a100d7aec588d7c1da9ad77ca7cc7c5b71;p=linux-2.6-omap-h63xx.git Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-fixes * git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-fixes: GFS2: Fix typo in gfs_page_mkwrite() GFS2: LSF and LBD are now one and the same GFS2: Set GFP_NOFS when allocating page on write --- 0d6326a100d7aec588d7c1da9ad77ca7cc7c5b71