]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commitea129a1a5962399b3d5a20bb9edab2743836eee6
tree5a639a0c88ff32eaa3d1cff2a4eea9b3e6e3bccf
parentc04a0d004fa8bff36a21aab2f95ebc633cb336e4
parent4553453b087cc9ccca3c38741687a6932d6b443c
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