tree 0f4d8c7b42bdf9f904a87c5ff13fb42e2ad43038
parent 7fbcca25c0bf8679a751034f65428ff6291cd4ca
parent ea8d62dadd0217334fb2c5d60e7f89e14076ca10
author Linus Torvalds <torvalds@linux-foundation.org> 1265143706 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1265143706 -0800

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: Use GFP_NOFS for alloc structure
  GFS2: Fix previous patch
  GFS2: Don't withdraw on partial rindex entries
  GFS2: Fix refcnt leak on gfs2_follow_link() error path