tree 37a224868f9c17e38742c6644a5df86fad598a55
parent b9ffce9ae14fa6068a7c8c3ce2350ee3a8c1787b
parent 50e48bd0673180311874d0c1bd88505eefd75c4e
author Linus Torvalds <torvalds@linux-foundation.org> 1441737093 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1441737093 -0700

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

Pull m68k/colfire fixes from Greg Ungerer:
 "Only a couple of patches this time.  One migrating the clock driver
  code to the new set-state interface.  The other cleaning up to use the
  PFN_DOWN macro"

* 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu:
  m68k/coldfire: use PFN_DOWN macro
  m68k/coldfire/pit: Migrate to new 'set-state' interface