tree 19544bac887b5849e6a3b4cbd2f78d7cd6774268
parent 14016899967739585b7450d486681f4c5deec149
parent 7ce9d5d1f3c8736511daa413c64985a05b2feee3
author Linus Torvalds <torvalds@linux-foundation.org> 1236533097 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1236533097 -0700

Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4

* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4:
  ext4: fix ext4_free_inode() vs. ext4_claim_inode() race