Merge tag 'jfs-3.7' of git://github.com/kleikamp/linux-shaggy
commiteb0ad9c06d51edb5d18a7007fd4d77a8805b2ba7
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 3 Oct 2012 15:48:21 +0000 (3 08:48 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 3 Oct 2012 15:48:21 +0000 (3 08:48 -0700)
tree987595aa0cfa6e9fdf367a1ec3f5e8b04849c777
parent1f7df953d687860690cc0e388d0efec215c09e9c
parent84f4141ee3ea11035f741d4298cb6bbad1850fcf
Merge tag 'jfs-3.7' of git://github.com/kleikamp/linux-shaggy

Pull JFS update from Dave Kleikamp:
 "JFS TRIM support and some minor fixes"

* tag 'jfs-3.7' of git://github.com/kleikamp/linux-shaggy:
  jfs: Fix do_div precision in commit b40c2e66
  JFS: use list_move instead of list_del/list_add
  jfs: Remove obsolete email address
  fs/jfs: TRIM support for JFS Filesystem
fs/jfs/jfs_incore.h
fs/jfs/super.c