From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 12 Dec 2016 16:48:28 +0000 (-0800)
Subject: Merge tag 'm68k-for-v4.10-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v4.10-rc1~198
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=709c12e3f5c5f3efd11d3fbd43d35535dc3a34d0;p=karo-tx-linux.git

Merge tag 'm68k-for-v4.10-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k

Pull m68k updates from Geert Uytterhoeven:
 "Use seq_puts() for fixed strings"

* tag 'm68k-for-v4.10-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
  m68k/atari: Use seq_puts() in atari_get_hardware_list()
  m68k/amiga: Use seq_puts() in amiga_get_hardware_list()
---

709c12e3f5c5f3efd11d3fbd43d35535dc3a34d0