diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-10-03 10:51:41 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-10-03 10:51:41 -0400 |
commit | 37cc7ab1d2c317cc989b8aa0224cfc5f0478ccbd (patch) | |
tree | 3db756ca12b5ab24fab1b7b5cb99ef7635cd370a /arch/um/drivers/chan_kern.c | |
parent | a758379b031f50b9def094aad071ef547a5cb335 (diff) | |
parent | 67dfae0cd72fec5cd158b6e5fb1647b7dbe0834c (diff) | |
download | op-kernel-dev-37cc7ab1d2c317cc989b8aa0224cfc5f0478ccbd.zip op-kernel-dev-37cc7ab1d2c317cc989b8aa0224cfc5f0478ccbd.tar.gz |
Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull timer fixes from Ingo Molnar:
"An abs64() fix in the watchdog driver, and two clocksource driver
NO_IRQ assumption fixes"
* 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
clocksource: Fix abs() usage w/ 64bit values
clocksource/drivers/keystone: Fix bad NO_IRQ usage
clocksource/drivers/rockchip: Fix bad NO_IRQ usage
Diffstat (limited to 'arch/um/drivers/chan_kern.c')
0 files changed, 0 insertions, 0 deletions