projects / platform / kernel / linux-starfive.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 1ca17e9 7e251bb)
Merge tag 'm68k-for-v4.9-tag2' of git://git.kernel.org/pub/scm/linux/kernel/git/geert...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 9 Dec 2016 18:54:54 +0000 (10:54 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 9 Dec 2016 18:54:54 +0000 (10:54 -0800)
commit751471201eb92b95a29cf3dd2b296ee6f6d93d23
tree5a639a0c88ff32eaa3d1cff2a4eea9b3e6e3bccftree | snapshot
parent1ca17e97966aa4b651e56861f83695e3645bf954commit | diff
parent7e251bb21ae08ca2e4fb28cc0981fac2685a8efacommit | diff
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
Domain: System / Kernel;