From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 5 Aug 2014 16:58:37 +0000 (-0700)
Subject: Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=f67d251a87ccb288a3a164c5226c6ee9ce8ea53d;p=deliverable%2Flinux.git

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

Pull m68knommu fixes from Greg Ungerer:
 "Just a couple of small fixes.  Fix definition of page_to_phys() and
  remove unecesary prototype of kobjsize()"

* 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu:
  m68knommu: Remove unnecessary prototype for kobjsize()
  m68knommu: Correct page_to_phys when PAGE_OFFSET is non-zero.
---

f67d251a87ccb288a3a164c5226c6ee9ce8ea53d