From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 5 Apr 2014 20:18:52 +0000 (-0700)
Subject: Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=472e374161bc00d392e1755fe9915f42b11e310f;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git

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

Pull m68k fixes from Greg Ungerer:
 "Just a couple of fixes.  Clean up compile warnings by using correct
  types in function args, and clean out the removed CONFIG_MTD_PARTITIONS"

* 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu:
  m68knommu: fix arg types for outs* functions
  m68k : Kill CONFIG_MTD_PARTITIONS
---

472e374161bc00d392e1755fe9915f42b11e310f