tree f20e2d78107edd3f4247350b5e6d2e2560bff9d8
parent d8204ee2ad1c9babd7e33d4c118ec99a78a8442e
parent add8240eedb586b9d885c324db7f98fc1a470f9f
author Linus Torvalds <torvalds@linux-foundation.org> 1233160917 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1233160917 -0800

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: fix 5329 ColdFire periphal addressing
  uclinux: add process name to allocation error message
  m68knommu: correct the mii calculations for 532x ColdFire FEC
  m68knommu: add ColdFire M532x to the FEC configuration options
  m68knommu: fix syscall restarting
  m68knommu: remove the obsolete and long unused comempci chip support
  m68knommu: remove the no longer used PCI support option
  m68knommu: remove obsolete and unused eLIA board
  m68knommu: set NO_DMA
  m68knommu: fix cache flushing for the 527x ColdFire processors
  m68knommu: fix ColdFire 5272 serial baud rates in mcf.c
  m68knommu: use one exist from execption