diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-09-30 00:32:49 +0300 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-09-30 00:32:49 +0300 |
commit | e1ce697db67421cc7e9a1cc1312149f3a4e08c93 (patch) | |
tree | c5da8bdc569e57665807d28b7351503f80221da3 /drivers/md/bcache/journal.c | |
parent | af17b3aa1fea3a87d81b499b3039a4b76a668d87 (diff) | |
parent | 090bcfd5d1b631ef0f6f46de19ae5a8d0cbfd6a0 (diff) | |
download | linux-e1ce697db67421cc7e9a1cc1312149f3a4e08c93.tar.xz |
Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Thomas writes:
"Three small fixes for clocksource drivers:
- Proper error handling in the Atmel PIT driver
- Add CLOCK_SOURCE_SUSPEND_NONSTOP for TI SoCs so suspend works again
- Fix the next event function for Facebook Backpack-CMM BMC chips so
usleep(100) doesnt sleep several milliseconds"
* 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
clocksource/drivers/timer-atmel-pit: Properly handle error cases
clocksource/drivers/fttmr010: Fix set_next_event handler
clocksource/drivers/ti-32k: Add CLOCK_SOURCE_SUSPEND_NONSTOP flag for non-am43 SoCs
Diffstat (limited to 'drivers/md/bcache/journal.c')
0 files changed, 0 insertions, 0 deletions