tree a77e01134ae46b79262dbf97614df7be920965f2
parent 458f8c895beba63851281dcdac3773685f0fae09
parent 2545cf6e94b4eb5a2c48dd55751aa9a70ff1ff9d
author Linus Torvalds <torvalds@linux-foundation.org> 1271878392 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1271878392 -0700

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