diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-10-17 08:47:27 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-10-17 08:47:27 -0700 |
| commit | 81429a6dbcbf3a01830de42dbdf0d9acbe68e1c1 (patch) | |
| tree | af7bf39c9b046a6c981617d2134b0d5608180765 /drivers/ide | |
| parent | 16c8b9cb246474ba4522182fc0d24caddcbba0dd (diff) | |
| parent | 0701c53e460ea64daf0ee789d0b08fef57800016 (diff) | |
| parent | 56fd16cabac9cd8f15e2902898a9d0cc96e2fa70 (diff) | |
| download | linux-81429a6dbcbf3a01830de42dbdf0d9acbe68e1c1.tar.bz2 | |
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()