summaryrefslogtreecommitdiffstats
path: root/drivers/clocksource/time-armada-370-xp.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2013-09-16 21:37:52 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2013-09-16 21:37:52 +0200
commitf1da3458e9d915d72b0dd30a7c41c3aff8f03589 (patch)
tree06221f0a766f6de14e9c1eaf48e4d80fbfcc12c4 /drivers/clocksource/time-armada-370-xp.c
parentMerge tag 'upstream-3.12-rc1' of git://git.infradead.org/linux-ubifs (diff)
parentUBI: Fix invalidate_fastmap() (diff)
downloadlinux-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