summary refs log tree commit diff
path: root/arch/m68k/sun3x
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2014-03-31 15:00:32 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2014-03-31 15:00:32 -0700
commitf24279172d610e5ab2b8a2e290490213b0622453 (patch)
treebb1b00b29bd70de8297b9e3d9dfe69a119e533a5 /arch/m68k/sun3x
parent1f8c538ed6a3323b06c2459e9ca36e0ae8bb0ebc (diff)
parent50be9eba831da114e1979726f4119d342698e651 (diff)
downloadlinux-f24279172d610e5ab2b8a2e290490213b0622453.tar.gz
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
Diffstat (limited to 'arch/m68k/sun3x')
0 files changed, 0 insertions, 0 deletions