aboutsummaryrefslogtreecommitdiffstats
path: root/fs/ubifs/commit.c
diff options
context:
space:
mode:
authorLinus Torvalds <[email protected]>2015-03-01 20:00:25 +0000
committerLinus Torvalds <[email protected]>2015-03-01 20:00:25 +0000
commit640c0f5c57864cbc1f495509bdc879fab94d4d9d (patch)
treeee1e68209cf3a1ad5ff6edfcc684ee3724c5af7b /fs/ubifs/commit.c
parentMerge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/ke... (diff)
parentMerge branch 'clockevents/4.0-rc1' of git://git.linaro.org/people/daniel.lezc... (diff)
downloadkernel-640c0f5c57864cbc1f495509bdc879fab94d4d9d.tar.gz
kernel-640c0f5c57864cbc1f495509bdc879fab94d4d9d.zip
Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull timer fixes from Ingo Molnar: "Three clockevents/clocksource driver fixes" * 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: clocksource: pxa: Fix section mismatch clocksource: mtk: Fix race conditions in probe code clockevents: asm9260: Fix compilation error with sparc/sparc64 allyesconfig
Diffstat (limited to 'fs/ubifs/commit.c')
0 files changed, 0 insertions, 0 deletions