Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 11 Jul 2017 16:52:56 +0000 (09:52 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 11 Jul 2017 16:52:56 +0000 (09:52 -0700)
commita0188177344c8efdb1467889a0ec148554869e15
treef310ab39aa751d40e65044f0e0edfb4c8c552790
parent9967468c0a109644e4a1f5b39b39bf86fe7507a7
parent354b6382847d1d95b576d0c851df7a5743b8a2c2
Merge branch 'for-next' of git://git./linux/kernel/git/gerg/m68knommu

Pull x86nommu update from Greg Ungerer:
 "Only a single change, to remove old Kconfig options from defconfigs"

* 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu:
  m68k: defconfig: Cleanup from old Kconfig options