From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 8 Sep 2015 18:31:33 +0000 (-0700)
Subject: Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu
X-Git-Tag: v4.3-rc1~60
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=1c8cc72d57f321bfccadf4f7b38b94ba287928bc;p=users%2Fwilly%2Flinux.git

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
---

1c8cc72d57f321bfccadf4f7b38b94ba287928bc