diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-11-13 23:10:24 +0300 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-11-13 23:10:24 +0300 |
commit | 9e09d05cfe7df9efa7bbca7d679af534a616026e (patch) | |
tree | ae9501674896ae1bc19a78ad4c97fbfc666e4bcb /include/linux/platform_data/intel-mid_wdt.h | |
parent | d60a540ac5f2fbab3e6fe592717b445bd7343a91 (diff) | |
parent | 5e387199c17c4d2fb8b72ada82fbf81f4ba6f317 (diff) | |
download | linux-9e09d05cfe7df9efa7bbca7d679af534a616026e.tar.xz |
Merge tag 'm68k-for-v4.15-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k
Pull m68k updates from Geert Uytterhoeven:
- more printk modernization
- various cleanups and fixes (incl. a race condition) for Mac
- defconfig updates
* tag 'm68k-for-v4.15-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
m68k/defconfig: Update defconfigs for v4.14-rc7
m68k/mac: Add mutual exclusion for IOP interrupt polling
m68k/mac: Disentangle VIA/RBV and NuBus initialization
m68k/mac: Disentangle VIA and OSS initialization
m68k/mac: More printk modernization
Diffstat (limited to 'include/linux/platform_data/intel-mid_wdt.h')
0 files changed, 0 insertions, 0 deletions