]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: b94eea1 e440a32)
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)
commit6be12b3fcc45e5304d459cdb563437acb1cb3882
treebb54b8c8a06f06bd6d316452d442fd327fe0d712tree | snapshot
parentb94eea1d6911934bf98272fc2e872795651d4183commit | diff
parente440a32cf1cd952a5bfc967f91b2eadf31106c74commit | diff
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.
Linux Kernel Source Tree.