commit | 751471201eb92b95a29cf3dd2b296ee6f6d93d23 | [log] [tgz] |
---|---|---|
author | Linus Torvalds <torvalds@linux-foundation.org> | Fri Dec 09 10:54:54 2016 -0800 |
committer | Linus Torvalds <torvalds@linux-foundation.org> | Fri Dec 09 10:54:54 2016 -0800 |
tree | 5a639a0c88ff32eaa3d1cff2a4eea9b3e6e3bccf | |
parent | 1ca17e97966aa4b651e56861f83695e3645bf954 [diff] | |
parent | 7e251bb21ae08ca2e4fb28cc0981fac2685a8efa [diff] |
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