aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/clocksource/qcom-timer.c
diff options
context:
space:
mode:
authorLinus Torvalds <[email protected]>2015-05-16 23:33:59 +0000
committerLinus Torvalds <[email protected]>2015-05-16 23:33:59 +0000
commit92752b5cddcfe421767cf61151bf5a1553a6540b (patch)
tree2ec40ee20d4f5a906f83a5cb66e8ccd385d54d34 /drivers/clocksource/qcom-timer.c
parentMerge tag 'upstream-4.1-rc4' of git://git.infradead.org/linux-ubifs (diff)
parenthostfs: Use correct mask for file mode (diff)
downloadkernel-92752b5cddcfe421767cf61151bf5a1553a6540b.tar.gz
kernel-92752b5cddcfe421767cf61151bf5a1553a6540b.zip
Merge branch 'for-linus-4.1-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml
Pull UML hostfs fix from Richard Weinberger: "This contains a single fix for a regression introduced in 4.1-rc1" * 'for-linus-4.1-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml: hostfs: Use correct mask for file mode
Diffstat (limited to 'drivers/clocksource/qcom-timer.c')
0 files changed, 0 insertions, 0 deletions