From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 18 Jan 2013 19:58:10 +0000 (-0800)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu
X-Git-Tag: firefly_0821_release~3680^2~1241
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=b814469ad515c70d9269d5268607bd6fbfb32533;p=firefly-linux-kernel-4.4.55.git

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

Pull m68knommu arch fixes from Greg Ungerer:
 "This contains a couple of fixes, both affecting compilation of non-mmu
  m68k targets."

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu:
  m68k: fix conditional use of init_pointer_table
  m68knommu: add KMAP definitions for non-MMU definitions
---

b814469ad515c70d9269d5268607bd6fbfb32533