From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 21 Apr 2010 19:33:12 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu
X-Git-Tag: v5.15~29804
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=1ef6ce7a340f9ed139a73147ff9cf7ad56889414;p=mirror_ubuntu-kernels.git

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

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu:
  m68knommu: allow 4 coldfire serial ports
  m68knommu: fix coldfire tcdrain
  m68knommu: remove a duplicate vector setting line for 68360
  Fix m68k-uclinux's rt_sigreturn trampoline
  m68knommu: correct the CC flags for Coldfire M5272 targets
  uclinux: error message when FLAT reloc symbol is invalid, v2
---

1ef6ce7a340f9ed139a73147ff9cf7ad56889414