From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 22 Oct 2012 05:54:24 +0000 (+0300)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux... 
X-Git-Tag: firefly_0821_release~3680^2~1751
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=4fe7e866a7d43479ac8d8a610023a9c9275f488f;p=firefly-linux-kernel-4.4.55.git

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

Pull m68k updates from Geert Uytterhoeven:
 "Just the expected UAPI disintegration and the "new" kcmp syscall."

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
  m68k: Wire up kcmp
  m68k: Remove empty #ifdef/#else/#endif block
  UAPI: (Scripted) Disintegrate arch/m68k/include/asm
---

4fe7e866a7d43479ac8d8a610023a9c9275f488f