diff options
| author | Linus Torvalds <[email protected]> | 2017-08-10 16:36:06 +0000 |
|---|---|---|
| committer | Linus Torvalds <[email protected]> | 2017-08-10 16:36:06 +0000 |
| commit | f213ad386bc5727a354e7098e34351e1b0a049a3 (patch) | |
| tree | dad3f61ce018cc7837173bd8d850ca09fac73736 /drivers/iio/trigger/stm32-timer-trigger.c | |
| parent | Merge tag 'pinctrl-v4.13-2' of git://git.kernel.org/pub/scm/linux/kernel/git/... (diff) | |
| parent | sunvdc: prevent sunvdc panic when mpgroup disk added to guest domain (diff) | |
| download | kernel-f213ad386bc5727a354e7098e34351e1b0a049a3.tar.gz kernel-f213ad386bc5727a354e7098e34351e1b0a049a3.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc
Pull sparc updates from David Miller:
1) Recognize M8 cpus, just basic chip ID matching, from Allen Pais.
2) Prevent crashes when bringing up sunvdc virtual block devices in
some environments. From Jim Quigley.
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc:
sunvdc: prevent sunvdc panic when mpgroup disk added to guest domain
sparc64: Increase max_phys_bits to 51 and VA bits to 53 for M8.
sparc64: recognize and support sparc M8 cpu type
sparc64: properly name the cpu constants
Diffstat (limited to 'drivers/iio/trigger/stm32-timer-trigger.c')
0 files changed, 0 insertions, 0 deletions