tree 867174b8aa40d33b25511bd0d09d3e9c25b6bf4e
parent 067d14f0dde8c7d7c41064e7eb021db7477c9aac
parent 07c65a665b8d88f871d8083644ba3f41e68f048f
author Linus Torvalds <torvalds@linux-foundation.org> 1481561063 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1481561063 -0800

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

Pull m68knommu updates from Greg Ungerer:
 "There are two sets of changes in this pull.

  The largest is the addition of the ColdFire platform side i2c support
  (the IO addressing, setup and clock definitions). The i2c hardware
  module itself is driven by the kernels existing iMX i2c driver.

  The other change is the addition of support for the Amcore board"

* 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu:
  m68knommu: AMCORE board, add iMX i2c support
  m68k: add Sysam AMCORE open board support
  m68knommu: platform support for i2c devices on ColdFire SoC