diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-06-03 23:33:44 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-06-03 23:33:44 +0200 |
commit | 0ab60871b451b857206d7afc0d3033be866f76b4 (patch) | |
tree | 72dd70aba74f00cf78eeba41817b4b56622fafcf /mm/dmapool.c | |
parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gee... (diff) | |
parent | fs/jfs: Add check if journaling to disk has been disabled in lbmRead() (diff) | |
download | linux-0ab60871b451b857206d7afc0d3033be866f76b4.tar.xz linux-0ab60871b451b857206d7afc0d3033be866f76b4.zip |
Merge tag 'jfs-3.10-rc5' of git://github.com/kleikamp/linux-shaggy
Pull jfs bugfixes from David Kleikamp:
"A couple jfs bug fixes for 3.10-rc5"
* tag 'jfs-3.10-rc5' of git://github.com/kleikamp/linux-shaggy:
fs/jfs: Add check if journaling to disk has been disabled in lbmRead()
jfs: Several bugs in jfs_freeze() and jfs_unfreeze()
Diffstat (limited to 'mm/dmapool.c')
0 files changed, 0 insertions, 0 deletions