Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 8 Sep 2015 18:31:33 +0000 (11:31 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 8 Sep 2015 18:31:33 +0000 (11:31 -0700)
commit1c8cc72d57f321bfccadf4f7b38b94ba287928bc
tree37a224868f9c17e38742c6644a5df86fad598a55
parentb9ffce9ae14fa6068a7c8c3ce2350ee3a8c1787b
parent50e48bd0673180311874d0c1bd88505eefd75c4e
Merge branch 'for-next' of git://git./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