]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commit
Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-fixes
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 2 Feb 2010 20:48:26 +0000 (12:48 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 2 Feb 2010 20:48:26 +0000 (12:48 -0800)
commit4dab75ec3ebf28583fc902ac946b287b5acdbcad
tree0f4d8c7b42bdf9f904a87c5ff13fb42e2ad43038
parent7fbcca25c0bf8679a751034f65428ff6291cd4ca
parentea8d62dadd0217334fb2c5d60e7f89e14076ca10
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