tree e24ae9d2c35508f68016b8cde848b7608e737b32
parent 5398a64c63a69a0ac33dbae458ea4aab0dc23f14
parent 7ff9c073dd4d7200399076554f7ab9b876f196f6
author Linus Torvalds <torvalds@linux-foundation.org> 1289246093 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1289246093 -0800

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: Add new ext4 inode tracepoints
  ext4: Don't call sb_issue_discard() in ext4_free_blocks()
  ext4: do not try to grab the s_umount semaphore in ext4_quota_off
  ext4: fix potential race when freeing ext4_io_page structures
  ext4: handle writeback of inodes which are being freed
  ext4: initialize the percpu counters before replaying the journal
  ext4: "ret" may be used uninitialized in ext4_lazyinit_thread()
  ext4: fix lazyinit hang after removing request