diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-03 08:48:21 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-03 08:48:21 -0700 |
| commit | eb0ad9c06d51edb5d18a7007fd4d77a8805b2ba7 (patch) | |
| tree | 987595aa0cfa6e9fdf367a1ec3f5e8b04849c777 /arch/cris/Makefile | |
| parent | 1f7df953d687860690cc0e388d0efec215c09e9c (diff) | |
| parent | 84f4141ee3ea11035f741d4298cb6bbad1850fcf (diff) | |
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
Diffstat (limited to 'arch/cris/Makefile')
0 files changed, 0 insertions, 0 deletions