summaryrefslogtreecommitdiff
path: root/drivers/pcmcia
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2013-06-04 06:33:44 +0900
committerLinus Torvalds <torvalds@linux-foundation.org>2013-06-04 06:33:44 +0900
commit0ab60871b451b857206d7afc0d3033be866f76b4 (patch)
tree72dd70aba74f00cf78eeba41817b4b56622fafcf /drivers/pcmcia
parentaa4f608478acb7ed69dfcff4f3c404100b78ac49 (diff)
parent95bbb82f60c80808e5a49d8233c2de8451901531 (diff)
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 'drivers/pcmcia')
0 files changed, 0 insertions, 0 deletions