From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 31 Mar 2014 22:00:32 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux... 
X-Git-Tag: Ubuntu-5.4-5.4.0-11.14~14759
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=f24279172d610e5ab2b8a2e290490213b0622453;p=mirror_ubuntu-focal-kernel.git

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k

Pull m68k updates from Geert Uytterhoeven.

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
  m68k: Update defconfigs for v3.14-rc1
  [SCSI] atari_scsi: Fix sleep_on race
  m68k: head.S - Remove bogus L prefix in comment
  m68k: Remove dead code
  m68k: Remove CONSOLE_PENGUIN macro, adopt CONFIG_LOGO
---

f24279172d610e5ab2b8a2e290490213b0622453