diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-09-16 21:37:52 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-09-16 21:37:52 +0200 |
commit | f1da3458e9d915d72b0dd30a7c41c3aff8f03589 (patch) | |
tree | 06221f0a766f6de14e9c1eaf48e4d80fbfcc12c4 /drivers/clocksource/time-armada-370-xp.c | |
parent | Merge tag 'upstream-3.12-rc1' of git://git.infradead.org/linux-ubifs (diff) | |
parent | UBI: Fix invalidate_fastmap() (diff) | |
download | linux-f1da3458e9d915d72b0dd30a7c41c3aff8f03589.tar.xz linux-f1da3458e9d915d72b0dd30a7c41c3aff8f03589.zip |
Merge tag 'upstream-3.12-rc1' of git://git.infradead.org/linux-ubi
Pull UBI fixes from Artem Bityutskiy:
"Just a single fastmap fix plus a regression fix"
* tag 'upstream-3.12-rc1' of git://git.infradead.org/linux-ubi:
UBI: Fix invalidate_fastmap()
UBI: Fix PEB leak in wear_leveling_worker()
Diffstat (limited to 'drivers/clocksource/time-armada-370-xp.c')
0 files changed, 0 insertions, 0 deletions