tree 0c72daa900a20c895036832d521019ae26ca3931
parent 463b21fb27509061b3e97fb4fa69f26d089ddaf4
parent 4dc5aa2172373fe7ccc25bc22fc21fcf150a66c5
author Linus Torvalds <torvalds@linux-foundation.org> 1396729132 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1396729132 -0700

Merge branch 'for-next' of git://git.kernel.org/pub/scm/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