diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-10-17 17:47:27 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-10-17 17:47:27 +0200 |
| commit | 81429a6dbcbf3a01830de42dbdf0d9acbe68e1c1 (patch) | |
| tree | af7bf39c9b046a6c981617d2134b0d5608180765 /arch/sh | |
| parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dto... (diff) | |
| parent | genirq/msi: Do not use pci_msi_[un]mask_irq as default methods (diff) | |
| parent | timekeeping: Increment clock_was_set_seq in timekeeping_init() (diff) | |
| download | linux-81429a6dbcbf3a01830de42dbdf0d9acbe68e1c1.tar.xz linux-81429a6dbcbf3a01830de42dbdf0d9acbe68e1c1.zip | |
Merge branches 'irq-urgent-for-linus' and 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull irq/timer fixes from Thomas Gleixner:
"irq: a fix for the new hierarchical MSI interrupt handling which
unbreaks PCI=n configurations.
timers: a fix for the new hrtimer clock offset update mechanism to
ensure that the boot time offset is respected"
* 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
genirq/msi: Do not use pci_msi_[un]mask_irq as default methods
* 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
timekeeping: Increment clock_was_set_seq in timekeeping_init()