From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 9 Dec 2016 18:54:54 +0000 (-0800)
Subject: Merge tag 'm68k-for-v4.9-tag2' of git://git.kernel.org/pub/scm/linux/kernel/git/geert... 
X-Git-Tag: v4.14-rc1~1982
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=751471201eb92b95a29cf3dd2b296ee6f6d93d23;p=platform%2Fkernel%2Flinux-rpi.git

Merge tag 'm68k-for-v4.9-tag2' of git://git./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
---

751471201eb92b95a29cf3dd2b296ee6f6d93d23