tree b44a047855b70ad786461bb5f2bf6ee6f86b2c7b
parent 4ff12049d6b6cc79ad8ee092ae226434687062ec
parent 1ecb40643a9af05683b7a898d7141884bcb28a82
author Linus Torvalds <torvalds@linux-foundation.org> 1441057965 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1441057965 -0700

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k

Pull m68k updates from Geert Uytterhoeven.

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
  m68k/bootinfo: Use kmemdup rather than duplicating its implementation
  m68k/defconfig: Update defconfigs for v4.2-rc1
  m68k/defconfig: Disable experimental CONFIG_DM_CACHE