| commit | 1ef6ce7a340f9ed139a73147ff9cf7ad56889414 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Wed Apr 21 12:33:12 2010 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Wed Apr 21 12:33:12 2010 -0700 |
| tree | a77e01134ae46b79262dbf97614df7be920965f2 | |
| parent | 458f8c895beba63851281dcdac3773685f0fae09 [diff] | |
| parent | 2545cf6e94b4eb5a2c48dd55751aa9a70ff1ff9d [diff] |
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