commit | 0d6326a100d7aec588d7c1da9ad77ca7cc7c5b71 | [log] [tgz] |
---|---|---|
author | Linus Torvalds <torvalds@linux-foundation.org> | Wed Jan 07 11:58:06 2009 -0800 |
committer | Linus Torvalds <torvalds@linux-foundation.org> | Wed Jan 07 11:58:06 2009 -0800 |
tree | 39d62df5761bde66d010ea68a76081de938b186c | |
parent | 52fefcec97c25b15887e6a9a885ca54e7f7c0928 [diff] | |
parent | c8f554b947e80a90e1b43bbd4fd26c27765b5f96 [diff] |
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