Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-fixes
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 7 Jan 2009 19:58:06 +0000 (11:58 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 7 Jan 2009 19:58:06 +0000 (11:58 -0800)
commit0d6326a100d7aec588d7c1da9ad77ca7cc7c5b71
tree39d62df5761bde66d010ea68a76081de938b186c
parent52fefcec97c25b15887e6a9a885ca54e7f7c0928
parentc8f554b947e80a90e1b43bbd4fd26c27765b5f96
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 typo in gfs_page_mkwrite()
  GFS2: LSF and LBD are now one and the same
  GFS2: Set GFP_NOFS when allocating page on write