diff options
| author | Linus Torvalds <[email protected]> | 2016-12-09 18:54:54 +0000 |
|---|---|---|
| committer | Linus Torvalds <[email protected]> | 2016-12-09 18:54:54 +0000 |
| commit | 751471201eb92b95a29cf3dd2b296ee6f6d93d23 (patch) | |
| tree | 5a639a0c88ff32eaa3d1cff2a4eea9b3e6e3bccf /drivers/fpga/fpga-region.c | |
| parent | Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux (diff) | |
| parent | m68k: Fix ndelay() macro (diff) | |
| download | kernel-751471201eb92b95a29cf3dd2b296ee6f6d93d23.tar.gz kernel-751471201eb92b95a29cf3dd2b296ee6f6d93d23.zip | |
Merge tag 'm68k-for-v4.9-tag2' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k
Pull m68k fixes from Geert Uytterhoeven:
- build fix for drivers calling ndelay() in a conditional block without
curly braces
- defconfig updates
* tag 'm68k-for-v4.9-tag2' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
m68k: Fix ndelay() macro
m68k/defconfig: Update defconfigs for v4.9-rc1
Diffstat (limited to 'drivers/fpga/fpga-region.c')
0 files changed, 0 insertions, 0 deletions