]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 5 Aug 2014 16:58:37 +0000 (09:58 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 5 Aug 2014 16:58:37 +0000 (09:58 -0700)
commit70549d798d4b8891f6a84385373e370c2bd7fd9f
treebb54b8c8a06f06bd6d316452d442fd327fe0d712
parent258b49db773a43e8554476ee87b2c4197d36d6c8
parent93d41c6db14d02557425848b74dc80223f4aa6f2
Merge branch 'for-next' of git://git.kernel.org/pub/scm/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.